Merge remote-tracking branch 'mainline/develop' into MAGETWO-43435-phrase-concatenation
Showing
- app/code/Magento/AdminNotification/Block/System/Messages.php 2 additions, 5 deletionsapp/code/Magento/AdminNotification/Block/System/Messages.php
- app/code/Magento/AdminNotification/Model/Feed.php 2 additions, 2 deletionsapp/code/Magento/AdminNotification/Model/Feed.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php 1 addition, 1 deletion...AdminNotification/Model/ResourceModel/Grid/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php 1 addition, 1 deletion...e/Magento/AdminNotification/Model/ResourceModel/Inbox.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php 1 addition, 1 deletion...dminNotification/Model/ResourceModel/Inbox/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php 1 addition, 1 deletion...ication/Model/ResourceModel/Inbox/Collection/Critical.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php 1 addition, 1 deletion.../AdminNotification/Model/ResourceModel/System/Message.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php 3 additions, 3 deletions...ication/Model/ResourceModel/System/Message/Collection.php
- app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php 1 addition, 1 deletion.../ResourceModel/System/Message/Collection/Synchronized.php
- app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml 12 additions, 24 deletions...tion/view/adminhtml/templates/system/messages/popup.phtml
- app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js 16 additions, 5 deletions...minNotification/view/adminhtml/web/system/notification.js
- app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php 1 addition, 1 deletion...horization/Model/ResourceModel/Permissions/Collection.php
- app/code/Magento/Authorization/Model/ResourceModel/Role.php 3 additions, 3 deletionsapp/code/Magento/Authorization/Model/ResourceModel/Role.php
- app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php 1 addition, 1 deletion...nto/Authorization/Model/ResourceModel/Role/Collection.php
- app/code/Magento/Authorization/Model/ResourceModel/Rules.php 3 additions, 3 deletionsapp/code/Magento/Authorization/Model/ResourceModel/Rules.php
- app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php 1 addition, 1 deletion...to/Authorization/Model/ResourceModel/Rules/Collection.php
- app/code/Magento/Authorizenet/Model/Authorizenet.php 2 additions, 2 deletionsapp/code/Magento/Authorizenet/Model/Authorizenet.php
- app/code/Magento/Authorizenet/Model/Directpost.php 2 additions, 2 deletionsapp/code/Magento/Authorizenet/Model/Directpost.php
- app/code/Magento/Authorizenet/Model/ResourceModel/Debug.php 1 addition, 1 deletionapp/code/Magento/Authorizenet/Model/ResourceModel/Debug.php
- app/code/Magento/Authorizenet/Model/ResourceModel/Debug/Collection.php 1 addition, 1 deletion...nto/Authorizenet/Model/ResourceModel/Debug/Collection.php
Please register or sign in to comment