Bohdan Korablov
|
e936981618
|
Merge remote-tracking branch 'mainline/develop' into MAGETWO-66208-2
# Conflicts:
# app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php
# app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php
# app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
# app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImport/ProcessorTest.php
# app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
# app/code/Magento/Deploy/Test/Unit/Model/DeploymentConfig/ChangeDetectorTest.php
# app/code/Magento/Deploy/Test/Unit/Model/Plugin/ConfigChangeDetectorTest.php
# app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php
# dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ConfigImportCommandTest.php
|
2017-03-31 14:32:54 +03:00 |
|