Merge remote-tracking branch 'main-ce/develop' into MAGETWO-52844-2.1
Showing
- .htaccess 44 additions, 4 deletions.htaccess
- .htaccess.sample 70 additions, 29 deletions.htaccess.sample
- .travis.yml 2 additions, 4 deletions.travis.yml
- CHANGELOG.md 4 additions, 0 deletionsCHANGELOG.md
- README.md 1 addition, 1 deletionREADME.md
- app/bootstrap.php 3 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 2 additions, 2 deletions...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- app/code/Magento/AdminNotification/composer.json 6 additions, 6 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 10 additions, 10 deletionsapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/composer.json 4 additions, 4 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Authorizenet/Controller/Directpost/Payment/Place.php 4 additions, 0 deletions...ento/Authorizenet/Controller/Directpost/Payment/Place.php
- app/code/Magento/Authorizenet/composer.json 10 additions, 10 deletionsapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Backend/Model/Session/Quote.php 7 additions, 16 deletionsapp/code/Magento/Backend/Model/Session/Quote.php
- app/code/Magento/Backend/Model/Setup/MenuBuilder.php 47 additions, 0 deletionsapp/code/Magento/Backend/Model/Setup/MenuBuilder.php
- app/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php 42 additions, 0 deletionsapp/code/Magento/Backend/Test/Unit/Model/MenuBuilderTest.php
- app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php 60 additions, 17 deletions...ode/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php
- app/code/Magento/Backend/composer.json 19 additions, 19 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backend/etc/adminhtml/di.xml 8 additions, 0 deletionsapp/code/Magento/Backend/etc/adminhtml/di.xml
- app/code/Magento/Backend/i18n/en_US.csv 1 addition, 0 deletionsapp/code/Magento/Backend/i18n/en_US.csv
- app/code/Magento/Backend/view/adminhtml/layout/default.xml 1 addition, 0 deletionsapp/code/Magento/Backend/view/adminhtml/layout/default.xml
Please register or sign in to comment