Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-49914
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php 2 additions, 2 deletions...Magento/AdminNotification/Block/Grid/Renderer/Actions.php
- app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html 1 addition, 1 deletion...rontend/web/template/payment/authorizenet-directpost.html
- app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml 4 additions, 4 deletions...ento/Backend/view/adminhtml/templates/system/search.phtml
- app/code/Magento/Backup/Helper/Data.php 1 addition, 1 deletionapp/code/Magento/Backup/Helper/Data.php
- app/code/Magento/BraintreeTwo/Block/Paypal/Button.php 11 additions, 1 deletionapp/code/Magento/BraintreeTwo/Block/Paypal/Button.php
- app/code/Magento/BraintreeTwo/etc/frontend/di.xml 1 addition, 0 deletionsapp/code/Magento/BraintreeTwo/etc/frontend/di.xml
- app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php 1 addition, 1 deletionapp/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
- app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml 1 addition, 0 deletions.../Config/view/adminhtml/templates/system/config/edit.phtml
- app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php 56 additions, 39 deletions...to/Developer/Console/Command/SourceThemeDeployCommand.php
- app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php 92 additions, 8 deletions...est/Unit/Console/Command/SourceThemeDeployCommandTest.php
- app/code/Magento/Dhl/Model/Carrier.php 12 additions, 7 deletionsapp/code/Magento/Dhl/Model/Carrier.php
- app/code/Magento/Directory/Model/Currency/Import/Webservicex.php 4 additions, 3 deletions...e/Magento/Directory/Model/Currency/Import/Webservicex.php
- app/code/Magento/Email/Model/Template/Filter.php 2 additions, 0 deletionsapp/code/Magento/Email/Model/Template/Filter.php
- app/code/Magento/Fedex/Model/Carrier.php 25 additions, 1 deletionapp/code/Magento/Fedex/Model/Carrier.php
- app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php 57 additions, 1 deletionapp/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
- app/code/Magento/MediaStorage/Model/File/Storage/Database.php 20 additions, 0 deletions...code/Magento/MediaStorage/Model/File/Storage/Database.php
- app/code/Magento/Paypal/Block/Express/InContext/Minicart/Button.php 21 additions, 2 deletions...agento/Paypal/Block/Express/InContext/Minicart/Button.php
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml 14 additions, 15 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_au.xml
- app/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml 26 additions, 26 deletionsapp/code/Magento/Paypal/etc/adminhtml/rules/payment_ca.xml
Please register or sign in to comment