Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-20 09:12:42 +01:00
commit 111263ba91
2 changed files with 6 additions and 1 deletions

View File

@ -33,7 +33,7 @@ class common {
const TEMP_DIR = 'site/tmp/';
// Numéro de version
const ZWII_VERSION = '10.0.043';
const ZWII_VERSION = '10.0.044';
const ZWII_UPDATE_CHANNEL = "v10";
public static $actions = [];

View File

@ -191,6 +191,11 @@ tinymce.init({
]
});
/**
* Suppression du back ground TinyMCE
*
*/
$(body).removeAttr("background-image");
tinymce.PluginManager.add('stickytoolbar', function(editor, url) {