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

pull/1/head
yflory 4 years ago
commit 95084fd9d1

@ -1444,7 +1444,6 @@ define([
editor.addCommand(tag, new CKEDITOR.styleCommand(new CKEDITOR.style({ element: tag }))); editor.addCommand(tag, new CKEDITOR.styleCommand(new CKEDITOR.style({ element: tag })));
editor.setKeystroke( CKEDITOR.CTRL + CKEDITOR.ALT + styleKeys[tag], tag); editor.setKeystroke( CKEDITOR.CTRL + CKEDITOR.ALT + styleKeys[tag], tag);
}); });
}).nThen(function() { }).nThen(function() {
// Move ckeditor parts to have a structure like the other apps // Move ckeditor parts to have a structure like the other apps
var $contentContainer = $('#cke_1_contents'); var $contentContainer = $('#cke_1_contents');

Loading…
Cancel
Save