Merge branch 'staging' into oo

2018-02-19 12:11:06 +01:00
parent 5827905dbd 299a2f4c08
commit 5c1e5a3f49
72 changed files with 1549 additions and 511 deletions
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.25.0",
+  "version": "1.26.0",
  "dependencies": {
    "chainpad-server": "^2.0.0",
    "express": "~4.10.1",
    "nthen": "~0.1.0",
    "pull-stream": "^3.6.1",
+    "replify": "^1.2.0",
    "saferphore": "0.0.1",
    "stream-to-pull-stream": "^1.7.2",
    "tweetnacl": "~0.12.2",