Merge remote-tracking branch 'upstream/develop' into MAGETWO-36747 (0305c88b) · 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 0305c88b authored 9 years ago by

Joan He

Browse files

Merge remote-tracking branch 'upstream/develop' into MAGETWO-36747

Conflicts:
	app/code/Magento/Config/Block/System/Config/Form/Fieldset/Factory.php
	app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Fieldset/Modules/DisableOutputTest.php

parents 51fc2c75 87f0ada5

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 487 additions and 81 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 remote-tracking branch 'upstream/develop' into MAGETWO-36747

Some changes are not shown.