Merge remote-tracking branch 'origin/2.3-develop-18387-catalog-images-resize' into 2.3-develop-18387-catalog-images-resize

vpodorozh · vpodorozh · commit c1aa5bc9c6c6 · 2018-10-30T15:27:21.000+02:00
# Conflicts:
#	app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/ImageTest.php
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Image.php
@@ -12,7 +12,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\App\ResourceConnection;
 
-/*
+/**
  * Class for retrieval of all product images
  */
 class Image
