Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into develop
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- COPYING.txt 2 additions, 2 deletionsCOPYING.txt
- app/code/Magento/Backend/etc/di.xml 0 additions, 1 deletionapp/code/Magento/Backend/etc/di.xml
- app/code/Magento/Backup/Model/Backup.php 3 additions, 3 deletionsapp/code/Magento/Backup/Model/Backup.php
- app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php 1 addition, 1 deletionapp/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
- app/code/Magento/Catalog/Model/Product.php 4 additions, 2 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Checkout/Controller/Cart/Configure.php 7 additions, 6 deletionsapp/code/Magento/Checkout/Controller/Cart/Configure.php
- app/code/Magento/Checkout/Controller/Cart/Index.php 1 addition, 0 deletionsapp/code/Magento/Checkout/Controller/Cart/Index.php
- app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_success.xml 3 additions, 0 deletions...heckout/view/frontend/layout/checkout_onepage_success.xml
- app/code/Magento/Core/etc/di.xml 0 additions, 2 deletionsapp/code/Magento/Core/etc/di.xml
- app/code/Magento/Customer/Model/Resource/Address.php 3 additions, 3 deletionsapp/code/Magento/Customer/Model/Resource/Address.php
- app/code/Magento/Customer/Model/Resource/Customer.php 3 additions, 3 deletionsapp/code/Magento/Customer/Model/Resource/Customer.php
- app/code/Magento/Directory/Model/PriceCurrency.php 4 additions, 10 deletionsapp/code/Magento/Directory/Model/PriceCurrency.php
- app/code/Magento/Email/Model/AbstractTemplate.php 3 additions, 3 deletionsapp/code/Magento/Email/Model/AbstractTemplate.php
- app/code/Magento/Email/Model/BackendTemplate.php 2 additions, 2 deletionsapp/code/Magento/Email/Model/BackendTemplate.php
- app/code/Magento/Email/Model/Template.php 2 additions, 2 deletionsapp/code/Magento/Email/Model/Template.php
- app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_success.xml 3 additions, 0 deletions...g/view/frontend/layout/multishipping_checkout_success.xml
- app/code/Magento/Newsletter/Model/Queue.php 2 additions, 2 deletionsapp/code/Magento/Newsletter/Model/Queue.php
- app/code/Magento/Newsletter/Model/Template.php 2 additions, 2 deletionsapp/code/Magento/Newsletter/Model/Template.php
- app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php 32 additions, 0 deletions...agento/OfflinePayments/Block/Form/AbstractInstruction.php
Please register or sign in to comment