Merge remote-tracking branch 'main/develop' into develop
Conflicts: lib/internal/Magento/Framework/View/Asset/Source.php
Showing
- .php_cs 0 additions, 1 deletion.php_cs
- app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php 41 additions, 9 deletions...cation/Controller/Adminhtml/System/Message/ListAction.php
- app/code/Magento/AdminNotification/etc/config.xml 1 addition, 1 deletionapp/code/Magento/AdminNotification/etc/config.xml
- app/code/Magento/AdminNotification/etc/module.xml 0 additions, 1 deletionapp/code/Magento/AdminNotification/etc/module.xml
- app/code/Magento/Authorization/Model/Acl/AclRetriever.php 3 additions, 1 deletionapp/code/Magento/Authorization/Model/Acl/AclRetriever.php
- app/code/Magento/Authorization/Setup/InstallData.php 12 additions, 0 deletionsapp/code/Magento/Authorization/Setup/InstallData.php
- app/code/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php 5 additions, 5 deletions...e/Magento/Backend/Controller/Adminhtml/Ajax/Translate.php
- app/code/Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php 5 additions, 5 deletions.../Magento/Backend/Controller/Adminhtml/Auth/DeniedJson.php
- app/code/Magento/Backend/Controller/Adminhtml/Cache.php 1 addition, 1 deletionapp/code/Magento/Backend/Controller/Adminhtml/Cache.php
- app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php 5 additions, 5 deletions...gento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 1 addition, 1 deletion...ento/Backend/Controller/Adminhtml/System/Account/Save.php
- app/code/Magento/Backend/Model/Auth.php 4 additions, 3 deletionsapp/code/Magento/Backend/Model/Auth.php
- app/code/Magento/Backend/Model/View/Layout/GeneratorPool.php 3 additions, 0 deletionsapp/code/Magento/Backend/Model/View/Layout/GeneratorPool.php
- app/code/Magento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php 21 additions, 13 deletions...ento/Backend/Test/Unit/Model/Menu/Filter/IteratorTest.php
- app/code/Magento/Backend/etc/adminhtml/menu.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/adminhtml/menu.xml
- app/code/Magento/Backend/etc/config.xml 1 addition, 1 deletionapp/code/Magento/Backend/etc/config.xml
- app/code/Magento/Backup/Model/Backup.php 2 additions, 2 deletionsapp/code/Magento/Backup/Model/Backup.php
- app/code/Magento/Bundle/Api/Data/LinkInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/LinkInterface.php
- app/code/Magento/Bundle/Api/Data/OptionInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/OptionInterface.php
- app/code/Magento/Bundle/Api/Data/OptionTypeInterface.php 15 additions, 0 deletionsapp/code/Magento/Bundle/Api/Data/OptionTypeInterface.php
Please register or sign in to comment