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

2017-10-23 12:33:57 +02:00 · 2017-10-23 12:33:57 +02:00 · 05c66e64dd
parent 288e141c1f ce5d24a1d3
commit 05c66e64dd
1 changed files with 1 additions and 0 deletions
--- a/customize.dist/template.js
+++ b/customize.dist/template.js
@ -90,6 +90,7 @@ $(function () {
        $('body').addClass('cp-page-' + css);
    }

+    window.Tether = function () {};
    require([
        'less!/customize/src/less2/main.less',
        'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',