Merge pull request #2619 from ether/master

Master
pull/2636/head
Stefan 2015-04-16 23:54:21 +02:00
commit 29ab7b9026
2 changed files with 4 additions and 1 deletions

View File

@ -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

View File

@ -55,5 +55,5 @@
"repository" : { "type" : "git",
"url" : "http://github.com/ether/etherpad-lite.git"
},
"version" : "1.5.5"
"version" : "1.5.6"
}