Merge pull request #2619 from ether/master

Master
2015-04-16 23:54:21 +02:00 · 2015-04-16 23:54:21 +02:00 · 29ab7b9026
parent 70d338c7d5 e509824f29
commit 29ab7b9026
2 changed files with 4 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,6 @@
+# 1.5.6
+ * Fix: Error on windows installations
+
 # 1.5.5
 * SECURITY: Also don't allow read files on directory traversal on minify paths
 * NEW: padOptions can be set in settings.json now
--- a/src/package.json
+++ b/src/package.json
@ -55,5 +55,5 @@
  "repository"     : { "type" : "git",
                       "url" : "http://github.com/ether/etherpad-lite.git"
                     },
-  "version"        : "1.5.5"
+  "version"        : "1.5.6"
 }