Merge remote-tracking branch 'upstream/develop' into MAGETWO-34625-ee-packages
Conflicts: composer.lock
Showing
- CHANGELOG.md 58 additions, 22 deletionsCHANGELOG.md
- app/code/Magento/AdminNotification/composer.json 5 additions, 5 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/Authorization/composer.json 3 additions, 3 deletionsapp/code/Magento/Authorization/composer.json
- app/code/Magento/Backend/composer.json 18 additions, 18 deletionsapp/code/Magento/Backend/composer.json
- app/code/Magento/Backup/composer.json 5 additions, 5 deletionsapp/code/Magento/Backup/composer.json
- app/code/Magento/Bundle/composer.json 17 additions, 17 deletionsapp/code/Magento/Bundle/composer.json
- app/code/Magento/CacheInvalidate/Model/Observer.php 99 additions, 0 deletionsapp/code/Magento/CacheInvalidate/Model/Observer.php
- app/code/Magento/CacheInvalidate/README.md 2 additions, 0 deletionsapp/code/Magento/CacheInvalidate/README.md
- app/code/Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php 138 additions, 0 deletions.../Magento/CacheInvalidate/Test/Unit/Model/ObserverTest.php
- app/code/Magento/CacheInvalidate/composer.json 24 additions, 0 deletionsapp/code/Magento/CacheInvalidate/composer.json
- app/code/Magento/CacheInvalidate/etc/events.xml 51 additions, 0 deletionsapp/code/Magento/CacheInvalidate/etc/events.xml
- app/code/Magento/CacheInvalidate/etc/module.xml 14 additions, 0 deletionsapp/code/Magento/CacheInvalidate/etc/module.xml
- app/code/Magento/Captcha/composer.json 6 additions, 6 deletionsapp/code/Magento/Captcha/composer.json
- app/code/Magento/Catalog/Model/Entity/Attribute.php 2 additions, 2 deletionsapp/code/Magento/Catalog/Model/Entity/Attribute.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php 2 additions, 2 deletions...e/Magento/Catalog/Model/Product/Attribute/Backend/Sku.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File.php 2 additions, 4 deletionsapp/code/Magento/Catalog/Model/Product/Option/Type/File.php
- app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php 9 additions, 8 deletions.../Catalog/Model/Product/Option/Type/File/ValidatorFile.php
- app/code/Magento/Catalog/composer.json 26 additions, 26 deletionsapp/code/Magento/Catalog/composer.json
- app/code/Magento/CatalogImportExport/composer.json 10 additions, 10 deletionsapp/code/Magento/CatalogImportExport/composer.json
- app/code/Magento/CatalogInventory/composer.json 9 additions, 9 deletionsapp/code/Magento/CatalogInventory/composer.json
Please register or sign in to comment