Merge remote-tracking branch 'mainline/develop' into develop
Showing
- app/code/Magento/Customer/Model/Customer/Attribute/Source/Website.php 1 addition, 1 deletion...ento/Customer/Model/Customer/Attribute/Source/Website.php
- app/code/Magento/Integration/Model/Oauth/Token/Factory.php 0 additions, 35 deletionsapp/code/Magento/Integration/Model/Oauth/Token/Factory.php
- app/code/Magento/Integration/Model/Oauth/Token/Provider.php 7 additions, 13 deletionsapp/code/Magento/Integration/Model/Oauth/Token/Provider.php
- app/code/Magento/Integration/Service/V1/AdminTokenService.php 1 addition, 1 deletion...code/Magento/Integration/Service/V1/AdminTokenService.php
- app/code/Magento/Integration/Service/V1/CustomerTokenService.php 1 addition, 1 deletion...e/Magento/Integration/Service/V1/CustomerTokenService.php
- app/code/Magento/Integration/Service/V1/Oauth.php 1 addition, 1 deletionapp/code/Magento/Integration/Service/V1/Oauth.php
- app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php 1 addition, 1 deletion...to/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
- app/code/Magento/User/Controller/Adminhtml/User/InvalidateToken.php 1 addition, 1 deletion...agento/User/Controller/Adminhtml/User/InvalidateToken.php
- app/code/Magento/User/Controller/Adminhtml/User/Role.php 9 additions, 1 deletionapp/code/Magento/User/Controller/Adminhtml/User/Role.php
- app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php 1 addition, 1 deletion.../Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
- app/code/Magento/Webapi/Model/Config/ClassReflector.php 20 additions, 1 deletionapp/code/Magento/Webapi/Model/Config/ClassReflector.php
- dev/tests/functional/lib/Mtf/App/State/AbstractState.php 1 addition, 1 deletiondev/tests/functional/lib/Mtf/App/State/AbstractState.php
- dev/tests/functional/tests/app/Magento/Store/Test/TestCase/StoreTest.php 1 addition, 1 deletion...ional/tests/app/Magento/Store/Test/TestCase/StoreTest.php
- dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxWithCrossBorderApplying.php 1 addition, 1 deletion...t/Constraint/AbstractAssertTaxWithCrossBorderApplying.php
- dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php 1 addition, 1 deletion...ional/tests/app/Magento/Tax/Test/TestCase/TaxRuleTest.php
- dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractConfigFiles.php 1 addition, 1 deletion...rk/Magento/TestFramework/TestCase/AbstractConfigFiles.php
- dev/tests/integration/testsuite/Magento/Backend/Block/Widget/GridTest.php 1 addition, 1 deletion...ation/testsuite/Magento/Backend/Block/Widget/GridTest.php
- dev/tests/integration/testsuite/Magento/Backend/Model/AuthTest.php 1 addition, 1 deletion.../integration/testsuite/Magento/Backend/Model/AuthTest.php
- dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php 1 addition, 1 deletion...ation/testsuite/Magento/Catalog/Block/Product/NewTest.php
- dev/tests/integration/testsuite/Magento/Catalog/Helper/Product/FlatTest.php 1 addition, 1 deletion...ion/testsuite/Magento/Catalog/Helper/Product/FlatTest.php
Please register or sign in to comment