Merge branch 'develop' into MAGETWO-31191
Conflicts: app/code/Magento/Newsletter/composer.json composer.lock
Showing
- CHANGELOG.md 52 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 6 additions, 6 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/Model/Plugin/QuoteItem.php 1 addition, 1 deletionapp/code/Magento/Bundle/Model/Plugin/QuoteItem.php
- app/code/Magento/Bundle/composer.json 16 additions, 16 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Captcha/composer.json 7 additions, 7 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/composer.json 24 additions, 24 deletionsapp/code/Magento/Catalog/composer.json
- app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml 2 additions, 1 deletion...alog/view/frontend/templates/product/view/addtocart.phtml
- app/code/Magento/Catalog/view/frontend/web/product/view/validation.js 1 addition, 1 deletion...ento/Catalog/view/frontend/web/product/view/validation.js
- app/code/Magento/CatalogImportExport/composer.json 10 additions, 10 deletionsapp/code/Magento/CatalogImportExport/composer.json
- app/code/Magento/CatalogInventory/composer.json 9 additions, 9 deletionsapp/code/Magento/CatalogInventory/composer.json
- app/code/Magento/CatalogRule/composer.json 10 additions, 10 deletionsapp/code/Magento/CatalogRule/composer.json
- app/code/Magento/CatalogSearch/composer.json 12 additions, 12 deletionsapp/code/Magento/CatalogSearch/composer.json
- app/code/Magento/CatalogUrlRewrite/composer.json 9 additions, 9 deletionsapp/code/Magento/CatalogUrlRewrite/composer.json
- app/code/Magento/CatalogWidget/composer.json 11 additions, 11 deletionsapp/code/Magento/CatalogWidget/composer.json
- app/code/Magento/Centinel/composer.json 7 additions, 7 deletionsapp/code/Magento/Centinel/composer.json
- app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php 0 additions, 1 deletionapp/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
- app/code/Magento/Checkout/Service/V1/Address/Billing/ReadService.php 0 additions, 58 deletions...gento/Checkout/Service/V1/Address/Billing/ReadService.php
Please register or sign in to comment