Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into Troll_S32 (89bc0d19) · 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 89bc0d19 authored 10 years ago by

Roman Ganin

Browse files

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into Troll_S32

Conflicts:
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

parents 1e2e24d3 123750d8

Hide whitespace changes

Inline Side-by-side

Showing with 569 additions and 177 deletions

Please register or to comment

Admin message

Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into Troll_S32