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

This commit is contained in:
yflory committed 2017-08-16 12:35:13 +02:00
commit e7ef1e1c2b
2 files changed
+3 -1

No files matched your search

+2
View File
@@ -410,6 +410,7 @@ define([
}
});
/*
// add the splitter
if (!$iframe.has('.cp-splitter').length) {
var $preview = $iframe.find('#previewContainer');
@@ -437,6 +438,7 @@ define([
});
});
}
*/
Cryptpad.removeLoadingScreen();
setEditable(true);