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

2017-09-12 18:40:20 +02:00
parent 437f50fd4a cce8811f9a
commit 8c41e0bdd6
5 changed files with 62 additions and 4 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -76,7 +76,7 @@ define([
                    ])
                ])
            ]),
-            h('div.cp-version-footer', "CryptPad v1.15.0 (Poukai)")
+            h('div.cp-version-footer', "CryptPad v1.16.0 (Qalupalik)")
        ]);
    };