Merge branch 'MAGETWO-32624' into develop
Conflicts: app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
Showing
- app/code/Magento/Config/Model/Config/ScopeDefiner.php 1 addition, 1 deletionapp/code/Magento/Config/Model/Config/ScopeDefiner.php
- app/code/Magento/Email/Model/BackendTemplate.php 1 addition, 0 deletionsapp/code/Magento/Email/Model/BackendTemplate.php
- app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php 1 addition, 1 deletion...Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
- app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php 1 addition, 1 deletion...Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php
- app/code/Magento/Store/Model/Config/Reader/DefaultReader.php 3 additions, 2 deletionsapp/code/Magento/Store/Model/Config/Reader/DefaultReader.php
- app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php 2 additions, 1 deletion...to/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
- app/code/Magento/Theme/Model/View/Design.php 1 addition, 0 deletionsapp/code/Magento/Theme/Model/View/Design.php
- dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php 1 addition, 0 deletions...egration/testsuite/Magento/Payment/Model/ObserverTest.php
- lib/internal/Magento/Framework/App/Config/Value.php 0 additions, 1 deletionlib/internal/Magento/Framework/App/Config/Value.php
Please register or sign in to comment