Merge pull request #2596 from ether/master

Master
This commit is contained in:
Stefan 2015-04-11 10:55:26 +02:00
commit a69b2a9cd1
2 changed files with 4 additions and 1 deletions

View file

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