Skip to content

Commit 657111c

Browse files
author
yuri kovsher
committed
Merge remote-tracking branch 'main-ce/develop' into MAGETWO-38793
Conflicts: dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
2 parents a0fd809 + 3b9e2d9 commit 657111c

File tree

149 files changed

+94
-12116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+94
-12116
lines changed

app/code/Magento/Customer/etc/adminhtml/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@
1212
<argument name="modelName" xsi:type="string">Magento\Customer\Model\Backend\Customer</argument>
1313
</arguments>
1414
</type>
15+
<preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Backend\Model\Session" />
1516
</config>

app/code/Magento/GoogleShopping/Block/Adminhtml/Captcha.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

app/code/Magento/GoogleShopping/Block/Adminhtml/Items.php

Lines changed: 0 additions & 111 deletions
This file was deleted.

app/code/Magento/GoogleShopping/Block/Adminhtml/Items/Item.php

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)