Merge branch 'hotfix-0.5.1' into stable

osixia · May 17, 2015 · a34e032 · a34e032
2 parents c2129c3 + 9cbfe94
commit a34e032
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,2 +1,5 @@
+## 0.5.1 (release date: 2015-03-17)
+  - Fix #1 (can't activate SSL with own certificates)
+
 ## 0.5.0 (release date: 2015-03-03)
-  - New version initial release
+  - New version initial release
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 NAME = osixia/phpldapadmin
-VERSION = 0.5.0
+VERSION = 0.5.1
 
 .PHONY: all build test tag_latest release
 
@@ -19,4 +19,3 @@ release: build test tag_latest
 	@if ! head -n 1 CHANGELOG.md | grep -q 'release date'; then echo 'Please note the release date in Changelog.md.' && false; fi
 	docker push $(NAME)
 	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
-