Merge remote-tracking branch 'mainline/develop' into MAGETWO-32432-32616 (2ca08f40) · 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 2ca08f40 authored 10 years ago by

Sviatoslav Mankivskyi

Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-32432-32616

Conflicts:
	app/etc/di.xml
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

parents ee5fffe1 123750d8

Hide whitespace changes

Inline Side-by-side

Showing with 569 additions and 176 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into MAGETWO-32432-32616