Merge remote-tracking branch 'mainline/develop' into bug-fixes (a0e08c1a) · 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 a0e08c1a authored 9 years ago by

Cari Spruiell

Browse files

Merge remote-tracking branch 'mainline/develop' into bug-fixes

# Conflicts:
#	app/code/Magento/Braintree/composer.json
#	app/code/Magento/Braintree/i18n/en_US.csv
#	app/code/Magento/BraintreeTwo/composer.json
#	app/code/Magento/BraintreeTwo/i18n/en_US.csv
#	composer.lock

parents d6fc0742 798a8420

Hide whitespace changes

Inline Side-by-side

Showing with 110 additions and 1573 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into bug-fixes