Merge branch 'develop' into bugfixes (bb2f255c) · Commits · KIII-12 / Magento · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

Magento
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

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.

KIII-12
Magento
Commits
bb2f255c

Commit bb2f255c authored 8 years ago by

Dmytro Voskoboinikov

Downloads
- Plain Diff

Merge branch 'develop' into bugfixes

parents 795f88a9 d7a38492

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Authorizenet/i18n/en_US.csv 1 addition, 0 deletions

app/code/Magento/Authorizenet/i18n/en_US.csv
app/code/Magento/Authorizenet/view/frontend/web/js/view/payment/method-renderer/authorizenet-directpost.js 4 additions, 3 deletions

...s/view/payment/method-renderer/authorizenet-directpost.js
app/code/Magento/Usps/Model/Carrier.php 104 additions, 104 deletions

app/code/Magento/Usps/Model/Carrier.php
dev/tests/functional/tests/app/Magento/Usps/Test/Repository/ConfigData.xml 16 additions, 1 deletion

...nal/tests/app/Magento/Usps/Test/Repository/ConfigData.xml
dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml 3 additions, 3 deletions

...ts/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml

with 128 additions and 111 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment