Merge remote-tracking branch 'origin/develop' into UI
Showing
- CHANGELOG.md 50 additions, 0 deletionsCHANGELOG.md
- Gruntfile.js 55 additions, 6 deletionsGruntfile.js
- README.md 1 addition, 1 deletionREADME.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/Backend/etc/adminhtml/system.xml 4 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backup/composer.json 4 additions, 4 deletionsapp/code/Magento/Backup/composer.json
- 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/Helper/Product.php 26 additions, 0 deletionsapp/code/Magento/Catalog/Helper/Product.php
- app/code/Magento/Catalog/Model/Category.php 2 additions, 1 deletionapp/code/Magento/Catalog/Model/Category.php
- app/code/Magento/Catalog/Model/Product.php 6 additions, 4 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/composer.json 24 additions, 24 deletionsapp/code/Magento/Catalog/composer.json
- app/code/Magento/Catalog/etc/adminhtml/di.xml 3 additions, 3 deletionsapp/code/Magento/Catalog/etc/adminhtml/di.xml
- app/code/Magento/Catalog/etc/di.xml 8 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- 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
Please register or sign in to comment