Merge remote-tracking branch 'mainline/develop' into jsonapi_compliant
Showing
- app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml 2 additions, 2 deletions...o/Braintree/view/frontend/templates/creditcard/edit.phtml
- app/code/Magento/Deploy/Model/Filesystem.php 5 additions, 5 deletionsapp/code/Magento/Deploy/Model/Filesystem.php
- app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php 173 additions, 0 deletions...to/Developer/Console/Command/SourceThemeDeployCommand.php
- app/code/Magento/Developer/Model/Css/PreProcessor/FileGenerator/PublicationDecorator.php 11 additions, 9 deletions...l/Css/PreProcessor/FileGenerator/PublicationDecorator.php
- app/code/Magento/Developer/Test/Unit/Console/Command/CssDeployCommandTest.php 0 additions, 191 deletions...eloper/Test/Unit/Console/Command/CssDeployCommandTest.php
- app/code/Magento/Developer/Test/Unit/Console/Command/SourceThemeDeployCommandTest.php 156 additions, 0 deletions...est/Unit/Console/Command/SourceThemeDeployCommandTest.php
- app/code/Magento/Developer/Test/Unit/Model/Css/PreProcessor/FileGenerator/PublicationDecoratorTest.php 25 additions, 14 deletions...s/PreProcessor/FileGenerator/PublicationDecoratorTest.php
- app/code/Magento/Developer/etc/di.xml 71 additions, 1 deletionapp/code/Magento/Developer/etc/di.xml
- app/code/Magento/Paypal/Model/Config.php 2 additions, 1 deletionapp/code/Magento/Paypal/Model/Config.php
- app/code/Magento/Paypal/view/frontend/templates/express/review.phtml 4 additions, 1 deletion...gento/Paypal/view/frontend/templates/express/review.phtml
- app/code/Magento/Translation/etc/di.xml 2 additions, 2 deletionsapp/code/Magento/Translation/etc/di.xml
- dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php 1 addition, 0 deletions...testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
- dev/tools/grunt/configs/combo.js 6 additions, 4 deletionsdev/tools/grunt/configs/combo.js
- lib/internal/Magento/Framework/App/View/Asset/Publisher.php 2 additions, 1 deletionlib/internal/Magento/Framework/App/View/Asset/Publisher.php
- setup/performance-toolkit/benchmark.jmx 7097 additions, 3261 deletionssetup/performance-toolkit/benchmark.jmx
Please register or sign in to comment