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

2019-08-27 10:55:03 +02:00 · 2019-08-27 10:55:03 +02:00 · 5c80a8d9b5
parent 8957bbd782 eb6a7f9262
commit 5c80a8d9b5
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -103,7 +103,7 @@ define([
                    ])*/
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.25.0 (Zebra)")
+            h('div.cp-version-footer', "CryptPad v3.0.0 (Aurochs)")
        ]);
    };

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