Merge branch 'soon' into staging

2018-08-16 13:33:09 +02:00
parent f5172fd05f 8a113d742e
commit 2259d1b6ac
8 changed files with 584 additions and 429 deletions
@@ -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';