Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into develop
Conflicts: dev/tests/functional/testsuites/Mtf/TestSuite/EndToEndCETests.php
Showing
- app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php 2 additions, 2 deletions...Notification/Model/Resource/System/Message/Collection.php
- app/code/Magento/Authorization/Model/Acl/AclRetriever.php 2 additions, 2 deletionsapp/code/Magento/Authorization/Model/Acl/AclRetriever.php
- app/code/Magento/Authorization/Model/Resource/Rules.php 4 additions, 4 deletionsapp/code/Magento/Authorization/Model/Resource/Rules.php
- app/code/Magento/Backend/Block/Context.php 2 additions, 2 deletionsapp/code/Magento/Backend/Block/Context.php
- app/code/Magento/Backend/Block/Template/Context.php 2 additions, 2 deletionsapp/code/Magento/Backend/Block/Template/Context.php
- app/code/Magento/Backend/Block/Widget/Context.php 2 additions, 2 deletionsapp/code/Magento/Backend/Block/Widget/Context.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Date.php 1 addition, 1 deletion...agento/Backend/Block/Widget/Grid/Column/Renderer/Date.php
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php 1 addition, 1 deletion...to/Backend/Block/Widget/Grid/Column/Renderer/Datetime.php
- app/code/Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php 1 addition, 1 deletion...Magento/Backend/Controller/Adminhtml/Dashboard/Tunnel.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Status.php 2 additions, 2 deletions...troller/Adminhtml/System/Config/System/Storage/Status.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Config/System/Storage/Synchronize.php 1 addition, 1 deletion...er/Adminhtml/System/Config/System/Storage/Synchronize.php
- app/code/Magento/Backend/Model/Menu.php 7 additions, 14 deletionsapp/code/Magento/Backend/Model/Menu.php
- app/code/Magento/Backend/Model/Menu/AbstractDirector.php 2 additions, 2 deletionsapp/code/Magento/Backend/Model/Menu/AbstractDirector.php
- app/code/Magento/Backend/Model/Menu/Config.php 6 additions, 10 deletionsapp/code/Magento/Backend/Model/Menu/Config.php
- app/code/Magento/Backend/Model/Menu/Director/Director.php 5 additions, 6 deletionsapp/code/Magento/Backend/Model/Menu/Director/Director.php
- app/code/Magento/Backend/etc/adminhtml/system.xml 0 additions, 17 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backend/i18n/de_DE.csv 1 addition, 1 deletionapp/code/Magento/Backend/i18n/de_DE.csv
- app/code/Magento/Backend/i18n/en_US.csv 1 addition, 1 deletionapp/code/Magento/Backend/i18n/en_US.csv
- app/code/Magento/Backend/i18n/es_ES.csv 1 addition, 1 deletionapp/code/Magento/Backend/i18n/es_ES.csv
- app/code/Magento/Backend/i18n/fr_FR.csv 1 addition, 1 deletionapp/code/Magento/Backend/i18n/fr_FR.csv
Please register or sign in to comment