Merge remote-tracking branch 'mainline/develop' into UI
Showing
- .htaccess 7 additions, 0 deletions.htaccess
- .htaccess.sample 7 additions, 0 deletions.htaccess.sample
- CHANGELOG.md 212 additions, 41 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/Model/Resource/Indexer/Price.php 0 additions, 21 deletionsapp/code/Magento/Bundle/Model/Resource/Indexer/Price.php
- app/code/Magento/Bundle/composer.json 17 additions, 17 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml 1 addition, 1 deletion...es/catalog/product/view/type/bundle/option/checkbox.phtml
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Model/Resource/Product/Indexer/Price/DefaultPrice.php 0 additions, 22 deletions...log/Model/Resource/Product/Indexer/Price/DefaultPrice.php
- app/code/Magento/Catalog/composer.json 26 additions, 26 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/Model/Observer.php 0 additions, 38 deletionsapp/code/Magento/CatalogRule/Model/Observer.php
- app/code/Magento/CatalogRule/composer.json 10 additions, 10 deletionsapp/code/Magento/CatalogRule/composer.json
- app/code/Magento/CatalogRule/etc/events.xml 0 additions, 12 deletionsapp/code/Magento/CatalogRule/etc/events.xml
- 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
Please register or sign in to comment