Merge branch 'master' into feature-25999/C4_ma0594dev

This commit is contained in:
Simon Gschnell
2023-12-13 14:34:37 +01:00
174 changed files with 8343 additions and 2898 deletions
+1 -4
View File
@@ -77,10 +77,7 @@
}
// Tabulator 5 CSS
if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
// Tinymce 4 CSS
if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
if ($tabulator5 === true) generateCSSsInclude('public/css/Tabulator5.css');
// Tinymce 5 CSS
if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');