Merge branch 'mainline-develop' into checkout (c88a4068) · 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 c88a4068 authored 9 years ago by

Olexii Korshenko

Browse files

Merge branch 'mainline-develop' into checkout

# Conflicts:
#	app/code/Magento/Captcha/composer.json
#	app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js
#	app/code/Magento/CheckoutAgreements/composer.json

parents 89505172 0d9ecaa0

Hide whitespace changes

Inline Side-by-side

Showing with 241 additions and 182 deletions

Please register or to comment

Admin message

Merge branch 'mainline-develop' into checkout