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

2019-09-30 15:54:34 +02:00
parent 1288f28931 16e8c96210
commit a530776ba8
21 changed files with 462 additions and 40 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1016,7 +1016,7 @@ define([
        var Cred, Block, Login;
        Nthen(function (waitFor) {
            require([
-                '/customize/credential.js',
+                '/common/common-credential.js',
                '/common/outer/login-block.js',
                '/customize/login.js'
            ], waitFor(function (_Cred, _Block, _Login) {