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

2017-09-05 15:34:49 +02:00 · 2017-09-05 15:34:49 +02:00 · d22edc03b3
commit d22edc03b3
parent 53eb9bb541 5c9ce0caa5
2 changed files with 2 additions and 2 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@ -77,7 +77,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v1.14.0 (Ouroboros)")
+            h('div.cp-version-footer', "CryptPad v1.15.0 (Poukai)")
        ]);
    };

--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "cryptpad",
  "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "1.14.0",
+  "version": "1.15.0",
  "dependencies": {
    "chainpad-server": "^1.0.1",
    "express": "~4.10.1",