Merge branch 'master' into feature-26336/Composer_Twig_Dependency_Security_Issue

This commit is contained in:
Paolo
2026-06-10 14:24:24 +02:00
1470 changed files with 228566 additions and 13397 deletions
+1 -1
View File
@@ -94,7 +94,7 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
<?php endif ?>
<?php if($tinymce) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce4/tinymce.min.js');?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/tinymce/tinymce5/tinymce.min.js');?>"></script>
<?php endif ?>
<?php if($textile) : ?>