Merge remote-tracking branch 'upstream/develop' into block-behavior

author Alex Gleason <alex@alexgleason.me>

Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)

committer Alex Gleason <alex@alexgleason.me>

Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)
author Alex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)
committer Alex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)
diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc test/pleroma/web/activity_pub/activity_pub_test.exs
Simple merge
diff --cc test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
Simple merge
author	Alex Gleason <alex@alexgleason.me>
	Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)
committer	Alex Gleason <alex@alexgleason.me>
	Wed, 14 Oct 2020 00:22:32 +0000 (19:22 -0500)
		1	2
config/config.exs	patch \|	diff1 \|	diff2 \|	blob \| history
config/description.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/activity_pub/activity_pub_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history