Merge pull request #2952 from ether/master

Merge release 1.6.0
2016-04-24 21:21:04 +02:00 · 2016-04-24 21:21:04 +02:00 · a076589b58
parent fb96f32028 dcfb287990
commit a076589b58
1 changed files with 1 additions and 1 deletions
--- a/src/package.json
+++ b/src/package.json
@ -55,6 +55,6 @@
  "repository"     : { "type" : "git",
                       "url" : "http://github.com/ether/etherpad-lite.git"
                     },
-  "version"        : "1.5.7",
+  "version"        : "1.6.0",
  "license"        : "Apache-2.0"
 }