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

This commit is contained in:
yflory committed 2017-12-21 18:21:14 +01:00
commit 888739e333
2 files changed
+2 -1

No files matched your search

+1 -1
View File
@@ -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) {