Merge remote-tracking branch 'mainline/develop' into BUGS (1cacbac3) · 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 1cacbac3 authored 8 years ago by

Sviatoslav Mankivskyi

Browse files

Merge remote-tracking branch 'mainline/develop' into BUGS

# Conflicts:
#	app/code/Magento/Catalog/etc/di.xml

parents d3922c15 ea0272d0

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 190 additions and 41 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into BUGS