Merge branch 'develop_mainline' into MAGETWO-39576-Profiler-JSON
Showing
- .htaccess 7 additions, 0 deletions.htaccess
- app/code/Magento/AdminNotification/composer.json 6 additions, 9 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/etc/acl.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/acl.xml
- app/code/Magento/AdminNotification/etc/adminhtml/di.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/di.xml
- app/code/Magento/AdminNotification/etc/adminhtml/events.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/events.xml
- app/code/Magento/AdminNotification/etc/adminhtml/menu.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/menu.xml
- app/code/Magento/AdminNotification/etc/adminhtml/routes.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/routes.xml
- app/code/Magento/AdminNotification/etc/adminhtml/system.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/adminhtml/system.xml
- app/code/Magento/AdminNotification/etc/config.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/config.xml
- app/code/Magento/AdminNotification/etc/di.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/di.xml
- app/code/Magento/AdminNotification/etc/module.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/module.xml
- app/code/Magento/AdminNotification/registration.php 11 additions, 0 deletionsapp/code/Magento/AdminNotification/registration.php
- app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml 1 addition, 1 deletion...on/view/adminhtml/layout/adminhtml_notification_block.xml
- app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_index.xml 1 addition, 1 deletion...on/view/adminhtml/layout/adminhtml_notification_index.xml
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 1 addition, 1 deletion...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/AdvancedPricingImportExport/composer.json 6 additions, 9 deletionsapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/AdvancedPricingImportExport/etc/adminhtml/routes.xml 1 addition, 1 deletion...ento/AdvancedPricingImportExport/etc/adminhtml/routes.xml
- app/code/Magento/AdvancedPricingImportExport/etc/di.xml 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/etc/di.xml
- app/code/Magento/AdvancedPricingImportExport/etc/export.xml 2 additions, 2 deletionsapp/code/Magento/AdvancedPricingImportExport/etc/export.xml
- app/code/Magento/AdvancedPricingImportExport/etc/import.xml 2 additions, 2 deletionsapp/code/Magento/AdvancedPricingImportExport/etc/import.xml
Please register or sign in to comment