Merge branch 'MAGETWO-49389' into develop (7d290eb8) · 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 7d290eb8 authored 9 years ago by

Yaroslav Onischenko

Browse files

Merge branch 'MAGETWO-49389' into develop

# Conflicts:
#	app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

parents 02b9466a 6d41c1ee

Branches

Admin message

Merge branch 'MAGETWO-49389' into develop