mirror of
https://github.com/bdnugget/magento2.git
synced 2026-11-07 17:27:36 +00:00
# Conflicts: # app/code/Magento/Checkout/composer.json # app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php # app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php # app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml # app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php # app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php # dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php