mirror of
https://github.com/bdnugget/magento2.git
synced 2026-11-07 09:17:35 +00:00
# Conflicts: # app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml # app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml # app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml # app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml