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

2017-12-06 18:33:16 +01:00
parent 604ea1c95f ba74f9d37a
commit 3e064e6638
43 changed files with 342 additions and 52 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -605,6 +605,7 @@ define([
        var initialized = false;

    return function (f, rdyCfg) {
+        rdyCfg = rdyCfg || {};
        if (initialized) {
            return void setTimeout(function () { f(void 0, env); });
        }