resolve merge conflict

2018-03-05 15:00:57 +01:00
parent 50adcc791c 3d66822473
commit 0af90ef88d
49 changed files with 1041 additions and 552 deletions
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.26.0",
+  "version": "1.27.0",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
    "chainpad-server": "^2.0.0",
-    "express": "~4.10.1",
+    "express": "~4.16.0",
    "nthen": "~0.1.0",
    "pull-stream": "^3.6.1",
    "replify": "^1.2.0",