Merge branch 'hotfix-0.6.5' into stable

BertrandGouny · BertrandGouny · commit d0f6f544e981 · 2015-11-20T18:18:18.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.6.5
+  - Upgrade baseimage: web-baseimage:0.1.6
+
 ## 0.6.4
   - Upgrade baseimage: web-baseimage:0.1.5
   - Remove listen on http when https is enable
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/phpldapadmin
-VERSION = 0.6.4
+VERSION = 0.6.5
 
 .PHONY: all build test tag_latest release
 
diff --git a/image/Dockerfile b/image/Dockerfile
@@ -1,4 +1,4 @@
-FROM osixia/web-baseimage:0.1.5
+FROM osixia/web-baseimage:0.1.6
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # phpLDAPadmin version

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM osixia/web-baseimage:0.1.5`
	`1`	`+FROM osixia/web-baseimage:0.1.6`
`2`	`2`	`MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>`
`3`	`3`
`4`	`4`	`# phpLDAPadmin version`