Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-42984-3
Showing
- app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 10 additions, 2 deletions...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
- app/code/Magento/Backend/Model/Session/AdminConfig.php 8 additions, 8 deletionsapp/code/Magento/Backend/Model/Session/AdminConfig.php
- app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php 8 additions, 11 deletions...gento/Backend/Test/Unit/Model/Session/AdminConfigTest.php
- app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml 1 addition, 1 deletion...w/adminhtml/templates/widget/form/renderer/fieldset.phtml
- 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/Braintree/view/frontend/web/template/payment/cc-form.html 4 additions, 1 deletion...Braintree/view/frontend/web/template/payment/cc-form.html
- app/code/Magento/Catalog/etc/di.xml 5 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Cookie/composer.json 1 addition, 1 deletionapp/code/Magento/Cookie/composer.json
- app/code/Magento/Customer/Console/Command/UpgradeHashAlgorithmCommand.php 1 addition, 1 deletion.../Customer/Console/Command/UpgradeHashAlgorithmCommand.php
- app/code/Magento/Deploy/Model/Deployer.php 46 additions, 16 deletionsapp/code/Magento/Deploy/Model/Deployer.php
- app/code/Magento/Deploy/composer.json 1 addition, 1 deletionapp/code/Magento/Deploy/composer.json
- 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/DownloadableImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/DownloadableImportExport/composer.json
- app/code/Magento/Email/Model/Template/Filter.php 6 additions, 4 deletionsapp/code/Magento/Email/Model/Template/Filter.php
Please register or sign in to comment