Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop (4514ef39) · 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 4514ef39 authored 9 years ago by

Dmytro Aponasenko

Browse files

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop

Conflicts:
	dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml

parents 262ba0ee d9fb06a4

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 97 additions and 199 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment

Admin message

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop

Some changes are not shown.