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

2017-12-21 18:21:14 +01:00
parent fa6106a6bb b0fe323a4c
commit 888739e333
2 changed files with 2 additions and 1 deletions
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -430,7 +430,7 @@ define([
    UI.addLoadingScreen = function (config) {
        config = config || {};
        var loadingText = config.loadingText;
-        var hideTips = config.hideTips;
+        var hideTips = config.hideTips || AppConfig.hideLoadingScreenTips;
        var hideLogo = config.hideLogo;
        var $loading, $container;
        if ($('#' + LOADING).length) {