Skip to content

Commit 34c854a

Browse files
authored
Merge branch '2.4-develop' into 2.4-develop-system_file-xsd-fix
2 parents 67d1013 + 8cad668 commit 34c854a

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

app/code/Magento/Store/etc/config.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<merge_files>0</merge_files>
2525
<minify_files>0</minify_files>
2626
<minify_exclude>
27-
<tiny_mce_6>/tiny_mce_6/</tiny_mce_6>
27+
<hugerte>/hugerte/</hugerte>
2828
</minify_exclude>
2929
</js>
3030
<css>
3131
<minify_files>0</minify_files>
3232
<minify_exclude>
33-
<tiny_mce_6>/tiny_mce_6/</tiny_mce_6>
33+
<hugerte>/hugerte/</hugerte>
3434
</minify_exclude>
3535
</css>
3636
<image>

app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ var config = {
1313
init: function () {
1414
'use strict';
1515
window.tinymce = window.hugerte;
16+
window.tinyMCE = window.hugerte;
1617
return window.hugerte;
1718
}
1819
}

0 commit comments

Comments
 (0)