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

2017-07-03 14:43:17 +02:00
parent 1df5e6e855 8b0210baf1
commit 81c8949aee
9 changed files with 214 additions and 42 deletions
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -695,8 +695,6 @@ define([
            Cryptpad.onLogout(function () { setEditable(false); });
        };

-        var interval = 100;
-
        var first = function () {
            Cryptpad.ready(function () {
                andThen();