Merge branch 'soon' into staging

This commit is contained in:
ansuz
2018-08-16 13:33:09 +02:00
8 changed files with 584 additions and 429 deletions

View File

@@ -5,7 +5,7 @@ CKEDITOR.editorConfig = function( config ) {
config.needsBrFiller= fixThings;
config.needsNbspFiller= fixThings;
config.removeButtons= 'Source,Maximize,Anchor';
config.removeButtons= 'Source,Maximize';
// magicline plugin inserts html crap into the document which is not part of the
// document itself and causes problems when it's sent across the wire and reflected back
config.removePlugins= 'resize,elementspath';

File diff suppressed because it is too large Load Diff