Merge branch '2.2-develop' of github.com:magento/magento2 into issue/12342/JSTestDriver-removal
Showing
- .github/.htaccess 8 additions, 0 deletions.github/.htaccess
- .github/CODE_OF_CONDUCT.md 46 additions, 0 deletions.github/CODE_OF_CONDUCT.md
- .github/CONTRIBUTING.md 0 additions, 0 deletions.github/CONTRIBUTING.md
- .github/ISSUE_TEMPLATE.md 0 additions, 0 deletions.github/ISSUE_TEMPLATE.md
- .github/PULL_REQUEST_TEMPLATE.md 0 additions, 0 deletions.github/PULL_REQUEST_TEMPLATE.md
- .htaccess 9 additions, 9 deletions.htaccess
- .htaccess.sample 9 additions, 9 deletions.htaccess.sample
- CHANGELOG.md 226 additions, 0 deletionsCHANGELOG.md
- README.md 4 additions, 2 deletionsREADME.md
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 1 addition, 1 deletion...ancedPricingImportExport/Model/Import/AdvancedPricing.php
- app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php 1 addition, 1 deletion...it/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
- app/code/Magento/Analytics/composer.json 2 additions, 2 deletionsapp/code/Magento/Analytics/composer.json
- app/code/Magento/Analytics/etc/di.xml 18 additions, 0 deletionsapp/code/Magento/Analytics/etc/di.xml
- app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php 1 addition, 1 deletionapp/code/Magento/Backend/Block/Dashboard/Orders/Grid.php
- app/code/Magento/Backend/Block/System/Store/Edit/AbstractForm.php 1 addition, 1 deletion.../Magento/Backend/Block/System/Store/Edit/AbstractForm.php
- app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php 3 additions, 3 deletions...ento/Backend/Controller/Adminhtml/System/Account/Save.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php 1 addition, 1 deletion...nto/Backend/Test/Unit/Block/Widget/Grid/ColumnSetTest.php
- app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php 1 addition, 1 deletion...agento/Backend/Test/Unit/Block/Widget/Grid/ColumnTest.php
- app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php 2 additions, 1 deletion...st/Unit/Model/Config/SessionLifetime/BackendModelTest.php
Please register or sign in to comment