Merge branch 'master' into staging

2018-08-27 15:10:00 +02:00 · 2018-08-27 15:10:00 +02:00 · 62817d09cb
commit 62817d09cb
parent 294fa38137 9fe78dcc5f
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -94,7 +94,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.5.0 (Fossa)")
+            h('div.cp-version-footer', "CryptPad v2.6.0 (Gibbon)")
        ]);
    };

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