Merge remote-tracking branch 'mainline/develop' into MAGETWO-43435-phrase-concatenation
Showing
- app/code/Magento/Braintree/Model/PaymentMethod.php 3 additions, 0 deletionsapp/code/Magento/Braintree/Model/PaymentMethod.php
- app/code/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php 2 additions, 0 deletions...e/Magento/Braintree/Test/Unit/Model/PaymentMethodTest.php
- app/code/Magento/Braintree/view/adminhtml/templates/form.phtml 1 addition, 1 deletion...ode/Magento/Braintree/view/adminhtml/templates/form.phtml
- app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml 1 addition, 1 deletion.../Braintree/view/frontend/templates/creditcard/index.phtml
- app/code/Magento/Deploy/Model/Deployer.php 46 additions, 16 deletionsapp/code/Magento/Deploy/Model/Deployer.php
- app/code/Magento/Deploy/etc/di.xml 7 additions, 0 deletionsapp/code/Magento/Deploy/etc/di.xml
- app/code/Magento/Developer/Console/Command/CssDeployCommand.php 13 additions, 18 deletions...de/Magento/Developer/Console/Command/CssDeployCommand.php
- app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php 23 additions, 21 deletions...eloper/Test/Unit/Console/Command/CssDeployCommandTest.php
- app/code/Magento/Developer/etc/di.xml 32 additions, 44 deletionsapp/code/Magento/Developer/etc/di.xml
- app/code/Magento/Email/Model/Template/Filter.php 6 additions, 4 deletionsapp/code/Magento/Email/Model/Template/Filter.php
- app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php 1 addition, 1 deletion...ode/Magento/Email/Test/Unit/Model/Template/FilterTest.php
- app/code/Magento/Payment/Gateway/Command/CommandPool.php 4 additions, 4 deletionsapp/code/Magento/Payment/Gateway/Command/CommandPool.php
- app/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php 4 additions, 4 deletionsapp/code/Magento/Payment/Gateway/Config/ValueHandlerPool.php
- app/code/Magento/Payment/Gateway/Request/BuilderComposite.php 4 additions, 4 deletions...code/Magento/Payment/Gateway/Request/BuilderComposite.php
- app/code/Magento/Payment/Gateway/Response/HandlerChain.php 4 additions, 4 deletionsapp/code/Magento/Payment/Gateway/Response/HandlerChain.php
- app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php 4 additions, 4 deletions.../Magento/Payment/Gateway/Validator/ValidatorComposite.php
- app/code/Magento/Payment/Gateway/Validator/ValidatorPool.php 4 additions, 4 deletionsapp/code/Magento/Payment/Gateway/Validator/ValidatorPool.php
- app/code/Magento/Payment/Model/Method/Logger.php 13 additions, 13 deletionsapp/code/Magento/Payment/Model/Method/Logger.php
- app/code/Magento/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php 5 additions, 4 deletions...nto/Payment/Test/Unit/Gateway/Command/CommandPoolTest.php
- app/code/Magento/Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php 5 additions, 4 deletions...Payment/Test/Unit/Gateway/Config/ValueHandlerPoolTest.php
Please register or sign in to comment