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

2017-08-22 18:19:06 +02:00
parent c33b128bf4 d9f5e3638e
commit 33025a9df9
10 changed files with 56 additions and 22 deletions
--- a/www/common/toolbar3.js
+++ b/www/common/toolbar3.js
@@ -606,7 +606,7 @@ define([
            title: buttonTitle,
            'class': "cryptpad-logo"
        }).append($('<img>', {
-            src: '/customize/images/logo_white.png'
+            src: '/customize/images/logo_white.png?' + ApiConfig.requireConf.urlArgs
        }));
        var onClick = function (e) {
            e.preventDefault();