Merge branch 'develop' into bugfixes
Showing
- app/bootstrap.php 3 additions, 3 deletionsapp/bootstrap.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdvancedPricingImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/AdvancedPricingImportExport/composer.json
- app/code/Magento/Authorization/composer.json 1 addition, 1 deletionapp/code/Magento/Authorization/composer.json
- app/code/Magento/Authorizenet/composer.json 1 addition, 1 deletionapp/code/Magento/Authorizenet/composer.json
- app/code/Magento/Backend/composer.json 1 addition, 1 deletionapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 1 addition, 1 deletionapp/code/Magento/Backup/composer.json
- app/code/Magento/Braintree/composer.json 1 addition, 1 deletionapp/code/Magento/Braintree/composer.json
- app/code/Magento/Bundle/composer.json 1 addition, 1 deletionapp/code/Magento/Bundle/composer.json
- app/code/Magento/BundleImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/BundleImportExport/composer.json
- app/code/Magento/CacheInvalidate/composer.json 1 addition, 1 deletionapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/Captcha/composer.json 1 addition, 1 deletionapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php 27 additions, 5 deletions...og/Controller/Adminhtml/Product/Initialization/Helper.php
- app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php 75 additions, 9 deletions...ontroller/Adminhtml/Product/Initialization/HelperTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php 20 additions, 1 deletion...g/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
- app/code/Magento/Catalog/composer.json 1 addition, 1 deletionapp/code/Magento/Catalog/composer.json
- app/code/Magento/Catalog/view/adminhtml/web/template/form/element/helper/custom-option-type-service.html 17 additions, 0 deletions...plate/form/element/helper/custom-option-type-service.html
- app/code/Magento/CatalogImportExport/composer.json 1 addition, 1 deletionapp/code/Magento/CatalogImportExport/composer.json
- app/code/Magento/CatalogInventory/composer.json 1 addition, 1 deletionapp/code/Magento/CatalogInventory/composer.json
- app/code/Magento/CatalogRule/composer.json 1 addition, 1 deletionapp/code/Magento/CatalogRule/composer.json
Please register or sign in to comment