Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2018-12-11 12:04:29 +01:00 · 2018-12-11 12:04:29 +01:00 · cc6ffcc788
parent 0197f583f2 8960c8fcbd
commit cc6ffcc788
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -91,7 +91,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.13.0 (Numbat)")
+            h('div.cp-version-footer', "CryptPad v2.14.0 (Opossum)")
        ]);
    };

--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.13.0",
+  "version": "2.14.0",
  "license": "AGPL-3.0+",
  "repository": {
    "type": "git",