Merge branch 'feature-16354/TinyMCE_move_to_new_version' into infocenter_2023_12_04

# Conflicts:
#	composer.lock
This commit is contained in:
ma0048
2023-12-04 12:44:10 +01:00
25 changed files with 411 additions and 44 deletions
-12
View File
@@ -270,17 +270,6 @@
}
}
},
{
"type": "package",
"package": {
"name": "tinymce/tinymce4",
"version": "4.9.11",
"dist": {
"url": "https://github.com/tinymce/tinymce-dist/archive/refs/tags/4.9.11.zip",
"type": "zip"
}
}
},
{
"type": "package",
"package": {
@@ -435,7 +424,6 @@
"scottjehl/respond": "1.4.2",
"tapmodo/jcrop": "2.0.4",
"tinymce/tinymce4": "4.9.*",
"tinymce/tinymce5": "5.10.*",
"tomazdragar/simplecropper": "1.0",
"twbs/bootstrap3": "3.4.*",