Merge branch 'MAGETWO-32624' into develop (914f5767) · 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 914f5767 authored 10 years ago by

Dale Sikkema

Browse files

Merge branch 'MAGETWO-32624' into develop

Conflicts:
	app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
	app/code/Magento/Tax/Test/Unit/Controller/Adminhtml/Tax/IgnoreTaxNotificationTest.php

parents 9bbf352c d1db7e3c

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 65 additions and 42 deletions

Please register or to comment

Admin message

Merge branch 'MAGETWO-32624' into develop