Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-22864-system-maintenance-command (40f25a40) · 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 40f25a40 authored 9 years ago by

Maddy Chellathurai

Browse files

Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-22864-system-maintenance-command

Conflicts:
	app/code/Magento/Indexer/composer.json
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

parents 175dbcdf feeb2876

Branches

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 1024 additions and 224 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainlineCE/develop' into MAGETWO-22864-system-maintenance-command