Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-62655 (033aef21) · 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 033aef21 authored 8 years ago by

Oleh Posyniak

Browse files

Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-62655

# Conflicts:
#	lib/internal/Magento/Framework/Console/Cli.php
#	setup/src/Magento/Setup/Console/CompilerPreparation.php
#	setup/src/Magento/Setup/Test/Unit/Console/CompilerPreparationTest.php

parents 1c3f9157 48153413

Hide whitespace changes

Inline Side-by-side

Showing with 20 additions and 20 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.com/magento/magento2ce into MAGETWO-62655

Some changes are not shown.