Merge remote-tracking branch 'mainline/develop' into develop
Conflicts: app/code/Magento/Ui/etc/di.xml
Showing
- CHANGELOG.md 20 additions, 0 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml 4 additions, 4 deletions...Notification/view/adminhtml/templates/toolbar_entry.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js 4 additions, 4 deletions...nto/AdminNotification/view/adminhtml/web/toolbar_entry.js
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/Block/Menu.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Menu.php
- app/code/Magento/Backend/Block/Widget/Grid.php 12 additions, 0 deletionsapp/code/Magento/Backend/Block/Widget/Grid.php
- app/code/Magento/Backend/Block/Widget/Grid/Extended.php 8 additions, 0 deletionsapp/code/Magento/Backend/Block/Widget/Grid/Extended.php
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml 22 additions, 3 deletions...agento/Backend/view/adminhtml/templates/admin/login.phtml
- app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml 4 additions, 4 deletions...agento/Backend/view/adminhtml/templates/page/header.phtml
- 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/CacheInvalidate/composer.json 3 additions, 3 deletionsapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Captcha/view/adminhtml/templates/default.phtml 19 additions, 4 deletions...de/Magento/Captcha/view/adminhtml/templates/default.phtml
- app/code/Magento/Catalog/composer.json 26 additions, 26 deletionsapp/code/Magento/Catalog/composer.json
- app/code/Magento/Catalog/view/adminhtml/web/catalog/product.js 34 additions, 24 deletions...ode/Magento/Catalog/view/adminhtml/web/catalog/product.js
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 1 addition, 1 deletion...code/Magento/CatalogImportExport/Model/Export/Product.php
- app/code/Magento/CatalogImportExport/composer.json 10 additions, 10 deletionsapp/code/Magento/CatalogImportExport/composer.json
Please register or sign in to comment