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
magento · Dec 1, 2016 · b072b98 · b072b98
1 parent dd55965
commit b072b98
Showing 1 changed file with 0 additions and 49 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php b/dev/tests/integration/testsuite/Magento/Framework/App/Config/ScopePoolTest.php