Merge remote-tracking branch 'origin/MAGETWO-33631' into develop
Conflicts: app/etc/di.xml
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Gruntfile.js 81 additions, 620 deletionsGruntfile.js
- app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php 4 additions, 4 deletions...on/Model/System/Message/Media/AbstractSynchronization.php
- app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php 1 addition, 1 deletion...on/Model/System/Message/Media/Synchronization/Success.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 1 deletionapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Backend/etc/adminhtml/system.xml 4 additions, 22 deletionsapp/code/Magento/Backend/etc/adminhtml/system.xml
- app/code/Magento/Backend/view/adminhtml/layout/default.xml 0 additions, 2 deletionsapp/code/Magento/Backend/view/adminhtml/layout/default.xml
- app/code/Magento/Bundle/Model/Product/Type.php 2 additions, 2 deletionsapp/code/Magento/Bundle/Model/Product/Type.php
- app/code/Magento/Bundle/composer.json 2 additions, 2 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml 2 additions, 1 deletion...html/templates/product/edit/bundle/option/selection.phtml
- app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php 4 additions, 1 deletion...o/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php
- app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php 6 additions, 6 deletions...agento/Catalog/Model/Category/Attribute/Backend/Image.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/Media.php 10 additions, 10 deletions...Magento/Catalog/Model/Product/Attribute/Backend/Media.php
- app/code/Magento/Catalog/Model/Product/Image.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Image.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File.php 5 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Option/Type/File.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php 2 additions, 2 deletions.../Catalog/Model/Product/Option/Type/File/ValidatorFile.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorInfo.php 3 additions, 3 deletions.../Catalog/Model/Product/Option/Type/File/ValidatorInfo.php
- app/code/Magento/Catalog/Model/Product/Type/AbstractType.php 3 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Type/AbstractType.php
- app/code/Magento/Catalog/Model/Resource/Product/Attribute/Backend/Image.php 4 additions, 4 deletions...atalog/Model/Resource/Product/Attribute/Backend/Image.php
- app/code/Magento/Catalog/composer.json 2 additions, 1 deletionapp/code/Magento/Catalog/composer.json
Please register or sign in to comment