Merge branch 'develop_mainline' into catalog-promo-form-refactoring (a05025d4) · 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 a05025d4 authored 9 years ago by

Iryna Lagno

Browse files

Merge branch 'develop_mainline' into catalog-promo-form-refactoring

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

parents 6a0fde69 c0fc5b25

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 378 additions and 108 deletions

Please register or to comment

Admin message

Merge branch 'develop_mainline' into catalog-promo-form-refactoring