Merge branch 'master' into dev10
This commit is contained in:
commit
0caaa2c10e
2
core/vendor/tinymce/init.js
vendored
2
core/vendor/tinymce/init.js
vendored
@ -20,7 +20,7 @@ tinymce.init({
|
||||
// Plugins
|
||||
plugins: "advlist anchor autolink autoresize autosave codemirror colorpicker contextmenu fullscreen hr image imagetools link lists media paste searchreplace stickytoolbar tabfocus table template textcolor codesample",
|
||||
// Contenu de la barre d'outils
|
||||
toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | template | image media link | fullscreen",
|
||||
toolbar: "restoredraft | undo redo | bold italic underline forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist | template code | image media link | fullscreen",
|
||||
// CodeMirror
|
||||
codemirror: {
|
||||
indentOnInit: true, // Whether or not to indent code on init.
|
||||
|
Loading…
Reference in New Issue
Block a user