Skip to content

Commit adb8a67

Browse files
Merge branch '2.4-develop' into spartans_pr_04062025
2 parents ff992e4 + 98b2848 commit adb8a67

File tree

5 files changed

+497
-418
lines changed

5 files changed

+497
-418
lines changed

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ lib/web/prototype/**/*.js
1818
lib/web/jquery/jstree/jquery.jstree.js
1919
lib/web/jquery/colorpicker/js/colorpicker.js
2020
lib/web/chartjs/chartjs-adapter-moment.js
21+
lib/web/moment-timezone-with-data.js
22+
lib/web/less/less.min.js
23+
lib/web/underscore.js
2124

2225
// MINIFIED FILES
2326
app/code/**/*.min.js

lib/web/less/less.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)