Merge remote-tracking branch 'main-ce/develop' into MAGETWO-39986
Showing
- .travis.yml 1 addition, 1 deletion.travis.yml
- app/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv 0 additions, 0 deletionsapp/code/Magento/AdvancedPricingImportExport/i18n/en_US.csv
- app/code/Magento/Authorization/i18n/en_US.csv 0 additions, 0 deletionsapp/code/Magento/Authorization/i18n/en_US.csv
- app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html 2 additions, 2 deletions...rontend/web/template/payment/authorizenet-directpost.html
- app/code/Magento/Backend/etc/adminhtml/system.xml 2 additions, 1 deletionapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html 2 additions, 2 deletions.../frontend/web/template/payment/braintree-paypal-form.html
- app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html 20 additions, 6 deletions...Braintree/view/frontend/web/template/payment/cc-form.html
- app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php 1 addition, 1 deletion...nto/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php
- app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php 1 addition, 1 deletionapp/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php
- app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php 1 addition, 1 deletion...ento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
- app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php 1 addition, 1 deletion...Magento/Bundle/Model/Sales/Order/Pdf/Items/Creditmemo.php
- app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php 1 addition, 1 deletion...de/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php
- app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php 1 addition, 1 deletion...e/Magento/Bundle/Model/Sales/Order/Pdf/Items/Shipment.php
- app/code/Magento/Bundle/Test/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php 2 additions, 2 deletions...t/Unit/Block/Adminhtml/Sales/Order/Items/RendererTest.php
- app/code/Magento/Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php 2 additions, 2 deletions...Bundle/Test/Unit/Block/Sales/Order/Items/RendererTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php 2 additions, 2 deletions...st/Unit/Model/Sales/Order/Pdf/Items/AbstractItemsTest.php
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml 1 addition, 1 deletion...ml/templates/sales/creditmemo/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml 1 addition, 1 deletion...html/templates/sales/creditmemo/view/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml 1 addition, 1 deletion...nhtml/templates/sales/invoice/create/items/renderer.phtml
- app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml 1 addition, 1 deletion...minhtml/templates/sales/invoice/view/items/renderer.phtml
Please register or sign in to comment