Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2017-05-11 15:54:27 +02:00
parent 9a6d63960b b76dcba1d6
commit b2b1f08d01
100 changed files with 4949 additions and 3063 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.5.0",
+  "version": "1.6.0",
  "dependencies": {
    "chainpad-server": "^1.0.1",
    "express": "~4.10.1",