Merge branch 'feature-new-baseimage' into release-0.8.0

BertrandGouny · BertrandGouny · commit e11220fb966b · 2014-06-24T15:14:19.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/baseimage:0.4.0
+FROM osixia/baseimage:0.5.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.fr>
 
 # From Nick Stenning's work

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/baseimage:0.4.0`
	`1`	`+FROM osixia/baseimage:0.5.0`
`2`	`2`	`MAINTAINER Bertrand Gouny <[email protected]>`
`3`	`3`
`4`	`4`	`# From Nick Stenning's work`