Merge remote-tracking branch 'upstream/develop' into restrict-origin

author Alex Gleason <alex@alexgleason.me>

Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)

committer Alex Gleason <alex@alexgleason.me>

Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
author Alex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
committer Alex Gleason <alex@alexgleason.me>
Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
Simple merge
diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge
diff --cc test/web/mastodon_api/controllers/timeline_controller_test.exs
Simple merge
author	Alex Gleason <alex@alexgleason.me>
	Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
committer	Alex Gleason <alex@alexgleason.me>
	Thu, 8 Oct 2020 22:24:09 +0000 (17:24 -0500)
		1	2
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/admin_api/controllers/admin_api_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/controllers/timeline_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history