Skip to content

Commit 6fe6b64

Browse files
committed
Merge remote-tracking branch 'origin/AC-14418' into PlatformHealthScope26May25
2 parents 8d40781 + 02f1ecd commit 6fe6b64

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ 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/less/less.min.js
2122

2223
// MINIFIED FILES
2324
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.

package.json.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"grunt-template-jasmine-requirejs": "~0.2.3",
2929
"grunt-text-replace": "~0.4.0",
3030
"imagemin-svgo": "~9.0.0",
31-
"less": "4.2.0",
31+
"less": "4.2.2",
3232
"load-grunt-config": "~4.0.1",
3333
"morgan": "~1.10.0",
3434
"node-minify": "~3.6.0",

0 commit comments

Comments
 (0)