mirror of
https://github.com/bdnugget/magento2.git
synced 2026-11-07 09:17:35 +00:00
# Conflicts: # app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/NewConditionHtml.php # app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php # app/code/Magento/Checkout/Test/Unit/Controller/Sidebar/UpdateItemQtyTest.php