Merge branch 'develop' of https://github.com/magento-frontend/magento2ce into MAGETWO-55594-2.2
Showing
- app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml 2 additions, 2 deletions.../frontend/templates/product/widget/link/link_inline.phtml
- app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml 2 additions, 2 deletions...Cms/view/frontend/templates/widget/link/link_inline.phtml
- app/code/Magento/Deploy/Model/DeployManager.php 9 additions, 14 deletionsapp/code/Magento/Deploy/Model/DeployManager.php
- app/code/Magento/Theme/etc/config.xml 5 additions, 0 deletionsapp/code/Magento/Theme/etc/config.xml
- dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php 1 addition, 1 deletion...ion/testsuite/Magento/Catalog/Model/Product/ImageTest.php
- dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php 1 addition, 1 deletion...ration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
- dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php 1 addition, 1 deletion...estsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php
- dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php 1 addition, 0 deletions...ion/testsuite/Magento/Email/Model/Template/FilterTest.php
- dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php 10 additions, 5 deletions...ntegration/testsuite/Magento/Email/Model/TemplateTest.php
- dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php 4 additions, 1 deletion...uite/Magento/Framework/View/Element/AbstractBlockTest.php
- dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php 1 addition, 1 deletion...ation/testsuite/Magento/Review/Controller/ProductTest.php
- dev/tests/integration/testsuite/Magento/Variable/Model/Variable/ConfigTest.php 5 additions, 4 deletions.../testsuite/Magento/Variable/Model/Variable/ConfigTest.php
- dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php 4 additions, 2 deletions...tion/testsuite/Magento/Widget/Model/Widget/ConfigTest.php
- lib/internal/Magento/Framework/View/Layout/etc/elements.xsd 1 addition, 1 deletionlib/internal/Magento/Framework/View/Layout/etc/elements.xsd
Please register or sign in to comment