Merge remote-tracking branch 'mainline/develop' into MAGETWO-32432-32616
Conflicts: app/code/Magento/Ui/composer.json composer.lock
Showing
- CHANGELOG.md 33 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 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/composer.json 17 additions, 17 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/composer.json 27 additions, 27 deletionsapp/code/Magento/Catalog/composer.json
- 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 11 additions, 11 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 10 additions, 10 deletionsapp/code/Magento/CatalogWidget/composer.json
- app/code/Magento/Centinel/composer.json 6 additions, 6 deletionsapp/code/Magento/Centinel/composer.json
- app/code/Magento/Checkout/composer.json 20 additions, 20 deletionsapp/code/Magento/Checkout/composer.json
- app/code/Magento/CheckoutAgreements/composer.json 5 additions, 5 deletionsapp/code/Magento/CheckoutAgreements/composer.json
- app/code/Magento/Cms/composer.json 11 additions, 11 deletionsapp/code/Magento/Cms/composer.json
- app/code/Magento/CmsUrlRewrite/composer.json 5 additions, 5 deletionsapp/code/Magento/CmsUrlRewrite/composer.json
- app/code/Magento/Config/composer.json 9 additions, 9 deletionsapp/code/Magento/Config/composer.json
Please register or sign in to comment