Merge remote-tracking branch 'mainline/develop' into MAGETWO-37848-prefix-length
Showing
- CHANGELOG.md 39 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 7 additions, 7 deletionsapp/code/Magento/AdvancedPricingImportExport/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/BundleImportExport/composer.json 7 additions, 7 deletionsapp/code/Magento/BundleImportExport/composer.json
- app/code/Magento/CacheInvalidate/composer.json 3 additions, 3 deletionsapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/Captcha/composer.json 7 additions, 7 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Category.php 1 addition, 1 deletion.../Catalog/Block/Adminhtml/Product/Helper/Form/Category.php
- app/code/Magento/Catalog/Block/Product/AbstractProduct.php 44 additions, 0 deletionsapp/code/Magento/Catalog/Block/Product/AbstractProduct.php
- app/code/Magento/Catalog/composer.json 26 additions, 26 deletionsapp/code/Magento/Catalog/composer.json
- app/code/Magento/Catalog/view/adminhtml/web/js/new-category-dialog.js 1 addition, 1 deletion...ento/Catalog/view/adminhtml/web/js/new-category-dialog.js
- app/code/Magento/Catalog/view/frontend/layout/catalog_category_view.xml 3 additions, 0 deletions...to/Catalog/view/frontend/layout/catalog_category_view.xml
- app/code/Magento/Catalog/view/frontend/templates/product/list.phtml 3 additions, 2 deletions...agento/Catalog/view/frontend/templates/product/list.phtml
- app/code/Magento/CatalogImportExport/composer.json 11 additions, 11 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
Please register or sign in to comment