mirror of
https://github.com/bdnugget/magento2.git
synced 2026-11-07 09:17:35 +00:00
# Conflicts: # app/code/Magento/Tinymce3/composer.json # app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Catalog/Category/ChooserTest.php # app/code/Magento/Widget/Test/Unit/Block/Adminhtml/Widget/Instance/Edit/Chooser/AbstractContainerTest.php # app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/CategoriesTest.php # app/code/Magento/Widget/Test/Unit/Model/Config/ConverterTest.php # app/code/Magento/Widget/Test/Unit/Model/ResourceModel/Layout/AbstractTestCase.php # app/code/Magento/Widget/Test/Unit/Model/Widget/InstanceTest.php