Merge branch 'develop'

andrewholgate · andrewholgate · commit e62a899847ad · 2016-02-25T21:49:05.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM andrewholgate/drupal-php70:0.4.0
+FROM andrewholgate/drupal-php70:0.4.1
 MAINTAINER Andrew Holgate <andrewholgate@yahoo.com>
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM andrewholgate/drupal-php70:0.4.0`
	`1`	`+FROM andrewholgate/drupal-php70:0.4.1`
`2`	`2`	`MAINTAINER Andrew Holgate <andrewholgate@yahoo.com>`
`3`	`3`
`4`	`4`	`RUN DEBIAN_FRONTEND=noninteractive apt-get update && \`