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

This commit is contained in:
yflory committed 2017-07-03 14:43:17 +02:00
commit 81c8949aee
9 files changed
+214 -42

No files matched your search

-2
View File
@@ -695,8 +695,6 @@ define([
Cryptpad.onLogout(function () { setEditable(false); });
};
var interval = 100;
var first = function () {
Cryptpad.ready(function () {
andThen();