public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2619 from ether/master 

Master
pull/2636/head
Stefan 2015-04-16 23:54:21 +02:00
parent 70d338c7d5 e509824f29
commit 29ab7b9026
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
# 1.5.6
* Fix: Error on windows installations
# 1.5.5 # 1.5.5
* SECURITY: Also don't allow read files on directory traversal on minify paths * SECURITY: Also don't allow read files on directory traversal on minify paths
* NEW: padOptions can be set in settings.json now * NEW: padOptions can be set in settings.json now

2
src/package.json
View File

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