Merge branch 'staging' into oo2

2018-12-13 16:24:11 +01:00
parent 855612e98b bca120a3ee
commit 760f58b74c
139 changed files with 16415 additions and 9509 deletions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.6.0",
+  "version": "2.14.0",
  "license": "AGPL-3.0+",
  "repository": {
    "type": "git",