Merge remote-tracking branch 'upstream/develop' into pr (dd55965a) · Commits · KIII-12 / Magento

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit dd55965a authored 8 years ago by

Joan He

Browse files

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

parents 9cd37983 3f4fe5e9

Hide whitespace changes

Inline Side-by-side

Showing with 903 additions and 139 deletions

Please register or to comment

Admin message

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