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

2017-03-15 18:59:38 +01:00
parent 298725b3c2 0607c3bbf3
commit 5eb32b33ee
14 changed files with 58 additions and 14 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1330,6 +1330,8 @@ define([
        }

        Messages._initSelector($block);
+
+        return $block;
    };

    var createUserAdminMenu = common.createUserAdminMenu = function (config) {