Revision 0267b222dfd423186830ad8d286b680c8813ed27

Committed on 12/11/2020 12:14 am by Dawid ParafiƄski <dawid.parafinski@ez.no> [GitHub Diff]

Merge remote-tracking branch 'remotes/platform/1.1' into 1.2

# Conflicts:
# eZ/Publish/Core/FieldType/ImageAsset/ImageAssetThumbnailStrategy.php