Merge branch 'develop-mainline' into MAGETWO-34552-main
Showing
- app/code/Magento/Backend/App/Config.php 5 additions, 3 deletionsapp/code/Magento/Backend/App/Config.php
- app/code/Magento/Backend/Block/Menu.php 25 additions, 15 deletionsapp/code/Magento/Backend/Block/Menu.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 6 additions, 3 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 97 additions, 70 deletions...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/Bundle/etc/service_data_attributes.xml 3 additions, 3 deletionsapp/code/Magento/Bundle/etc/service_data_attributes.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/Block/Product/View/Options.php 14 additions, 3 deletionsapp/code/Magento/Catalog/Block/Product/View/Options.php
- app/code/Magento/Catalog/Model/Observer.php 24 additions, 4 deletionsapp/code/Magento/Catalog/Model/Observer.php
- app/code/Magento/Catalog/Model/Product.php 47 additions, 20 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/Catalog/Model/Product/Type/AbstractType.php 14 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Type/AbstractType.php
- app/code/Magento/Catalog/Model/ProductLink/Management.php 26 additions, 69 deletionsapp/code/Magento/Catalog/Model/ProductLink/Management.php
Please register or sign in to comment