Merge branch 'v0.30.x'

author Dan Brown <redacted>

Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)

committer Dan Brown <redacted>

Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)
author Dan Brown <redacted>
Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)
committer Dan Brown <redacted>
Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)
diff --cc app/Entities/Tools/ExportFormatter.php
Simple merge
diff --cc app/Uploads/ImageRepo.php
Simple merge
author	Dan Brown <redacted>
	Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)
committer	Dan Brown <redacted>
	Fri, 18 Dec 2020 14:16:13 +0000 (14:16 +0000)
		1	2
app/Entities/Tools/ExportFormatter.php	patch \|	diff1 \|	diff2 \|	blob \| history
app/Uploads/ImageRepo.php	patch \|	diff1 \|	diff2 \|	blob \| history