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

2017-07-12 14:34:57 +02:00
parent b3e225cb3b f450a28d11
commit 2d509e3e25
130 changed files with 87227 additions and 25 deletions
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@@ -112,7 +112,7 @@ $(function () {
                ])
            ])
        ]),
-        h('div.version-footer', "CryptPad v1.10.0 (Kraken)")
+        h('div.version-footer', "CryptPad v1.11.0 (Lutin)")
    ]));

    var pathname = location.pathname;