Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/CatalogInventory/etc/di.xml
Showing
- app/code/Magento/Backend/App/Config.php 5 additions, 3 deletionsapp/code/Magento/Backend/App/Config.php
- app/code/Magento/Backend/Block/Page/System/Config/Robots/Reset.php 3 additions, 1 deletion...Magento/Backend/Block/Page/System/Config/Robots/Reset.php
- app/code/Magento/Backend/Model/Auth/Session.php 5 additions, 2 deletionsapp/code/Magento/Backend/Model/Auth/Session.php
- app/code/Magento/Backend/Model/Locale/Manager.php 1 addition, 1 deletionapp/code/Magento/Backend/Model/Locale/Manager.php
- app/code/Magento/Backend/Model/Session.php 0 additions, 33 deletionsapp/code/Magento/Backend/Model/Session.php
- app/code/Magento/Backend/Model/Session/Quote.php 5 additions, 2 deletionsapp/code/Magento/Backend/Model/Session/Quote.php
- app/code/Magento/Backend/Model/Url.php 3 additions, 3 deletionsapp/code/Magento/Backend/Model/Url.php
- app/code/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php 3 additions, 1 deletion...de/Magento/Backend/Test/Unit/Model/Locale/ManagerTest.php
- app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php 9 additions, 1 deletion...ode/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
- app/code/Magento/Backend/Test/Unit/Model/UrlTest.php 3 additions, 3 deletionsapp/code/Magento/Backend/Test/Unit/Model/UrlTest.php
- app/code/Magento/Backup/README.md 1 addition, 1 deletionapp/code/Magento/Backup/README.md
- app/code/Magento/Backup/view/adminhtml/layout/backup_index_block.xml 0 additions, 1 deletion...gento/Backup/view/adminhtml/layout/backup_index_block.xml
- app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php 37 additions, 16 deletions...ode/Magento/Catalog/Block/Product/ProductList/Toolbar.php
- app/code/Magento/Catalog/Model/Observer.php 24 additions, 4 deletionsapp/code/Magento/Catalog/Model/Observer.php
- app/code/Magento/Catalog/Model/Resource/Category.php 34 additions, 11 deletionsapp/code/Magento/Catalog/Model/Resource/Category.php
- app/code/Magento/Catalog/Model/Resource/Category/Collection.php 32 additions, 9 deletions...de/Magento/Catalog/Model/Resource/Category/Collection.php
- app/code/Magento/Catalog/Model/Resource/Product.php 49 additions, 10 deletionsapp/code/Magento/Catalog/Model/Resource/Product.php
- app/code/Magento/Catalog/Model/Session.php 1 addition, 1 deletionapp/code/Magento/Catalog/Model/Session.php
- app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php 87 additions, 6 deletions...talog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
- app/code/Magento/Catalog/etc/di.xml 11 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
Please register or sign in to comment