Merge branch 'staging' into oo2

2018-09-03 10:39:34 +02:00
parent dcd27f0da4 ee1027ceb9
commit bf9cf95292
197 changed files with 20203 additions and 8239 deletions
--- a/package.json
+++ b/package.json
@@ -1,12 +1,16 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.28.0",
-  "license": "AGPL-3.0-or-later",
+  "version": "2.6.0",
+  "license": "AGPL-3.0+",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/xwiki-labs/cryptpad.git"
+  },
  "dependencies": {
-    "chainpad-server": "^2.0.0",
+    "chainpad-server": "~2.1.0",
    "express": "~4.16.0",
-    "mkdirp": "^0.5.1",
+    "fs-extra": "^7.0.0",
    "nthen": "~0.1.0",
    "pull-stream": "^3.6.1",
    "replify": "^1.2.0",