Skip to content

Commit 718e161

Browse files
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-2734-V2
2 parents 9668008 + 3428ebc commit 718e161

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
<item type="directory">Lib::varien</item>
292292
<item type="directory">Lib::jquery/editableMultiselect</item>
293293
<item type="directory">Lib::jquery/jstree</item>
294-
<item type="directory">Lib::jquery/fileUploader</item>
294+
<item type="directory">Lib::jquery/uppy</item>
295295
<item type="directory">Lib::css</item>
296296
<item type="directory">Lib::lib</item>
297297
<item type="directory">Lib::extjs</item>

app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<item type="directory">Lib::varien</item>
303303
<item type="directory">Lib::jquery/editableMultiselect</item>
304304
<item type="directory">Lib::jquery/jstree</item>
305-
<item type="directory">Lib::jquery/fileUploader</item>
305+
<item type="directory">Lib::jquery/uppy</item>
306306
<item type="directory">Lib::css</item>
307307
<item type="directory">Lib::lib</item>
308308
<item type="directory">Lib::extjs</item>

0 commit comments

Comments
 (0)