Merge remote-tracking branch 'upstream/develop' into MAGETWO-30808-remove-include-path
Showing
- CHANGELOG.md 27 additions, 0 deletionsCHANGELOG.md
- CONTRIBUTING.md 22 additions, 19 deletionsCONTRIBUTING.md
- app/code/Magento/AdminNotification/Model/Resource/System/Message/Collection.php 2 additions, 2 deletions...Notification/Model/Resource/System/Message/Collection.php
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- 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/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- 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/Currency.php 1 addition, 1 deletion...to/Backend/Block/Widget/Grid/Column/Renderer/Currency.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/Block/Widget/Grid/Column/Renderer/Price.php 1 addition, 1 deletion...gento/Backend/Block/Widget/Grid/Column/Renderer/Price.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
Please register or sign in to comment