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

2019-01-08 17:47:38 +01:00
parent 6af7d393fd 34608a0484
commit 6a45f5233e
5 changed files with 14 additions and 9 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -91,7 +91,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v2.14.0 (Opossum)")
+            h('div.cp-version-footer', "CryptPad v2.15.0 (Pademelon)")
        ]);
    };