Merge branch 'features/reports-enhancements' into 'develop'

author lain <lain@soykaf.club>

Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)

committer lain <lain@soykaf.club>

Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)
author lain <lain@soykaf.club>
Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)
committer lain <lain@soykaf.club>
Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)
diff --cc lib/pleroma/web/api_spec/operations/admin/report_operation.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
author	lain <lain@soykaf.club>
	Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)
committer	lain <lain@soykaf.club>
	Sun, 28 Feb 2021 16:45:15 +0000 (16:45 +0000)
		1	2
lib/pleroma/web/api_spec/operations/admin/report_operation.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/router.ex	patch \|	diff1 \|	diff2 \|	blob \| history