Merge remote-tracking branch 'mainline/develop' into bugs
Showing
- app/code/Magento/CatalogInventory/Setup/UpgradeData.php 1 addition, 1 deletionapp/code/Magento/CatalogInventory/Setup/UpgradeData.php
- app/code/Magento/CatalogInventory/etc/module.xml 1 addition, 1 deletionapp/code/Magento/CatalogInventory/etc/module.xml
- app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml 12 additions, 21 deletions...view/frontend/templates/product/widget/content/grid.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml 2 additions, 2 deletions.../Cms/view/adminhtml/templates/browser/content/files.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml 1 addition, 1 deletion...s/view/adminhtml/templates/browser/content/uploader.phtml
- app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml 2 additions, 2 deletions...e/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
- app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml 5 additions, 1 deletion.../Cms/view/frontend/templates/widget/link/link_block.phtml
- app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml 5 additions, 1 deletion...Cms/view/frontend/templates/widget/link/link_inline.phtml
- app/code/Magento/Integration/Model/Config.php 20 additions, 4 deletionsapp/code/Magento/Integration/Model/Config.php
- app/code/Magento/Integration/Model/ConsolidatedConfig.php 16 additions, 4 deletionsapp/code/Magento/Integration/Model/ConsolidatedConfig.php
- app/code/Magento/Integration/Model/IntegrationConfig.php 16 additions, 4 deletionsapp/code/Magento/Integration/Model/IntegrationConfig.php
- app/code/Magento/Integration/Test/Unit/Model/ConsolidatedConfigTest.php 28 additions, 9 deletions...to/Integration/Test/Unit/Model/ConsolidatedConfigTest.php
- app/code/Magento/Integration/Test/Unit/Model/IntegrationConfigTest.php 29 additions, 9 deletions...nto/Integration/Test/Unit/Model/IntegrationConfigTest.php
- app/code/Magento/Marketplace/Helper/Cache.php 13 additions, 4 deletionsapp/code/Magento/Marketplace/Helper/Cache.php
- app/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php 53 additions, 44 deletionsapp/code/Magento/Marketplace/Test/Unit/Helper/CacheTest.php
- app/code/Magento/Quote/Model/QueryResolver.php 13 additions, 3 deletionsapp/code/Magento/Quote/Model/QueryResolver.php
- app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php 6 additions, 2 deletions...ode/Magento/Quote/Model/Quote/Address/Total/Collector.php
- app/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php 46 additions, 29 deletionsapp/code/Magento/Quote/Test/Unit/Model/QueryResolverTest.php
- app/code/Magento/Sales/Model/Config/Ordered.php 14 additions, 3 deletionsapp/code/Magento/Sales/Model/Config/Ordered.php
- app/code/Magento/Sales/Model/Order/Total/Config/Base.php 6 additions, 2 deletionsapp/code/Magento/Sales/Model/Order/Total/Config/Base.php
Please register or sign in to comment