Merge remote-tracking branch 'remotes/mainline/develop' into PR (e239d5ce) · 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 e239d5ce authored 9 years ago by

Olga Nakonechna

Browse files

Merge remote-tracking branch 'remotes/mainline/develop' into PR

Conflicts:
	app/code/Magento/Ui/view/base/web/js/grid/columns/multiselect.js

parents f34a9403 c077da60

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 378 additions and 105 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'remotes/mainline/develop' into PR