Commit b072b98

Joan He

committed

Merge remote-tracking branch 'upstream/develop' into pr

# Conflicts: # dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php # lib/internal/Magento/Framework/App/Config/ScopePool.php # lib/internal/Magento/Framework/App/ResourceConnection/Config.php # lib/internal/Magento/Framework/App/Test/Unit/Config/ScopePoolTest.php # lib/internal/Magento/Framework/App/Test/Unit/ResourceConnection/ConfigTest.php

1 parent dd55965 commit b072b98Copy full SHA for b072b98

1 file changed

+0

-49

lines changed

dev/tests/integration/testsuite/Magento/Framework/App/Config
- ScopePoolTest.php

1 file changed

+0

-49

lines changed

`‎dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php`

This file was deleted.

Comments

(0)