Merge branch 'staging' into oo

2018-03-21 11:32:59 +01:00
parent 7944bc1a82 f324d33723
commit a794efe931
37 changed files with 999 additions and 482 deletions
--- a/package.json
+++ b/package.json
@@ -1,15 +1,17 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.27.0",
+  "version": "1.28.0",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
    "chainpad-server": "^2.0.0",
    "express": "~4.16.0",
+    "mkdirp": "^0.5.1",
    "nthen": "~0.1.0",
    "pull-stream": "^3.6.1",
    "replify": "^1.2.0",
    "saferphore": "0.0.1",
+    "sortify": "^1.0.4",
    "stream-to-pull-stream": "^1.7.2",
    "tweetnacl": "~0.12.2",
    "ws": "^1.0.1",