Merge pull request #28077 from nextcloud/heicPerformance

author Julius Härtl <jus@bitgrid.net>

Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)

committer GitHub <noreply@github.com>

Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)
author Julius Härtl <jus@bitgrid.net>
Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)
committer GitHub <noreply@github.com>
Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)
diff --cc config/config.sample.php
Simple merge
diff --cc lib/private/PreviewManager.php
Simple merge
author	Julius Härtl <jus@bitgrid.net>
	Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)
committer	GitHub <noreply@github.com>
	Wed, 21 Jul 2021 08:27:19 +0000 (10:27 +0200)
		1	2
config/config.sample.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/private/PreviewManager.php	patch \|	diff1 \|	diff2 \|	blob \| history