Skip to content

Commit 0841685

Browse files
author
Ankur Kaneria
committed
Merge remote-tracking branch 'origin/MAGETWO-39536-requirejs-error-jsmin-enabled' into PR_Branch
2 parents fbe5aeb + 3a97fd7 commit 0841685

File tree

5 files changed

+199
-313
lines changed

5 files changed

+199
-313
lines changed

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,11 @@
183183
"components/jquery": [
184184
"lib/web/jquery.js",
185185
"lib/web/jquery/jquery.min.js",
186-
"lib/web/jquery/jquery-migrate.js",
187-
"lib/web/jquery/jquery-migrate.min.js"
186+
"lib/web/jquery/jquery-migrate.js"
188187
],
189188
"blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
190189
"components/jqueryui": [
191-
"lib/web/jquery/jquery-ui.js",
192-
"lib/web/jquery/jquery-ui.min.js"
190+
"lib/web/jquery/jquery-ui.js"
193191
],
194192
"twbs/bootstrap": [
195193
"lib/web/jquery/jquery.tabs.js"

0 commit comments

Comments
 (0)