Merge pull request #2596 from ether/master

Master
2015-04-11 10:55:26 +02:00 · 2015-04-11 10:55:26 +02:00 · a69b2a9cd1
parent acc1a0626a cc34f4e325
commit a69b2a9cd1
2 changed files with 4 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,6 @@
+# 1.5.4
+ * SECURITY: Also don't allow read files on directory traversal on frontend tests path
+
 # 1.5.3
 * NEW: Accessibility support for Screen readers, includes new fonts and keyboard shortcuts
 * NEW: API endpoint for Append Chat Message and Chat Backend Tests
--- 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.3"
+  "version"        : "1.5.4"
 }