MAGETWO-44072: Merge branch 'develop' of... (ad3ad4ca) · 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 ad3ad4ca authored 9 years ago by

Safwan Khan

Browse files

MAGETWO-44072: Merge branch 'develop' of...

MAGETWO-44072: Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-42194-weak-key

Conflicts:
	app/code/Magento/EncryptionKey/Model/Resource/Key/Change.php
	composer.lock

parents 2fe748d6 58cb4c7f

Hide whitespace changes

Inline Side-by-side

Showing with 268 additions and 287 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

MAGETWO-44072: Merge branch 'develop' of...

Some changes are not shown.