Merge remote-tracking branch 'mainline/develop' into MAGETWO-56317-2
Showing
- app/code/Magento/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php 6 additions, 0 deletions...o/Catalog/Block/Adminhtml/Helper/Form/Wysiwyg/Content.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php 4 additions, 1 deletion...nto/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
- app/code/Magento/CatalogImportExport/Model/Export/Product.php 18 additions, 1 deletion...code/Magento/CatalogImportExport/Model/Export/Product.php
- dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php 29 additions, 2 deletions.../Magento/CatalogImportExport/Model/Export/ProductTest.php
- dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_categories.php 9 additions, 0 deletions...logImportExport/_files/product_export_with_categories.php
- dev/tests/static/get_github_changes.php 38 additions, 4 deletionsdev/tests/static/get_github_changes.php
- dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php 38 additions, 29 deletions...atic/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php
- lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js 2 additions, 0 deletionslib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
Please register or sign in to comment