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

2018-06-11 15:40:46 +02:00 · 2018-06-11 15:40:46 +02:00 · 0d4fbec4bc
parent da396b6528 5a549f75a6
commit 0d4fbec4bc
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -95,7 +95,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.2.0 (Coati)")
+            h('div.cp-version-footer', "CryptPad v2.3.0 (Donkey)")
        ]);
    };

--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "2.2.0",
+  "version": "2.3.0",
  "license": "AGPL-3.0-or-later",
  "dependencies": {
    "chainpad-server": "^2.0.0",