Merge remote-tracking branch 'mainline/develop' into MAGETWO-44025
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/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/composer.json 1 addition, 1 deletionapp/code/Magento/Deploy/composer.json
- app/code/Magento/DownloadableImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/DownloadableImportExport/composer.json
- app/code/Magento/EncryptionKey/composer.json 1 addition, 1 deletionapp/code/Magento/EncryptionKey/composer.json
- app/code/Magento/Marketplace/composer.json 1 addition, 1 deletionapp/code/Magento/Marketplace/composer.json
- app/code/Magento/NewRelicReporting/composer.json 1 addition, 1 deletionapp/code/Magento/NewRelicReporting/composer.json
- app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php 5 additions, 0 deletions...nto/PageCache/Model/App/FrontController/BuiltinPlugin.php
- app/code/Magento/PageCache/Test/Unit/Model/App/FrontController/BuiltinPluginTest.php 1 addition, 0 deletions...Test/Unit/Model/App/FrontController/BuiltinPluginTest.php
- app/code/Magento/Swagger/composer.json 1 addition, 1 deletionapp/code/Magento/Swagger/composer.json
- app/code/Magento/Variable/composer.json 1 addition, 1 deletionapp/code/Magento/Variable/composer.json
- app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less 1 addition, 1 deletion.../backend/Magento_Ui/web/css/source/module/_data-grid.less
- composer.json 1 addition, 0 deletionscomposer.json
- composer.lock 9 additions, 8 deletionscomposer.lock
Please register or sign in to comment