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

2017-11-06 15:14:21 +01:00
parent c5f6491c37 9060464f37
commit 402fae442d
31 changed files with 1699 additions and 640 deletions
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -728,7 +728,7 @@ define([

    Pages['/profile/'] = Pages['/profile/index.html'] = function () {
        return [
-            h('div#toolbar'),
+            h('div#cp-toolbar'),
            h('div#container'),
            loadingScreen()
        ];