Commit 1efc75b

committed

Merge remote-tracking branch 'mainline/develop' into BugFestW6

2 parents 1fbbd81 + f85e691 commit 1efc75bCopy full SHA for 1efc75b

7 files changed

+253

-120

lines changed

app/code/Magento
- Braintree/view/frontend/web
  - js/view/payment/method-renderer
    - cc-form.js
  - template/payment
    - cc-form.html
- Checkout/view/frontend/web
  - js
    - sidebar.js
    - view
      - minicart.js
  - template/minicart
    - content.html
- Paypal
  - Model/Hostedpro
    - Request.php
  - Test/Unit/Model/Hostedpro
    - RequestTest.php

7 files changed

+253

-120

lines changed

Comments

(0)