resolve merge conflicts

2017-11-23 16:56:49 +01:00
parent 50da6b3b2e 1e9856647e
commit ee6c2097f5
88 changed files with 2238 additions and 8645 deletions
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@@ -26,10 +26,6 @@
        height: 28px;
        padding: 2px 0;
    }
-    #cke_1_top .cp-toolbar {
-        padding: 0;
-        display: block;
-    }
    .cke_wysiwyg_frame {
        min-width: 60%;
    }