Merge remote-tracking branch 'upstream/develop' into registration-workflow

author Alex Gleason <alex@alexgleason.me>

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

committer Alex Gleason <alex@alexgleason.me>

Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
author Alex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
committer Alex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
diff --cc lib/pleroma/web/twitter_api/controller.ex
Simple merge
diff --cc test/pleroma/emails/user_email_test.exs
Simple merge
diff --cc test/pleroma/user_test.exs
Simple merge
diff --cc test/pleroma/web/twitter_api/twitter_api_test.exs
Simple merge
author	Alex Gleason <alex@alexgleason.me>
	Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
committer	Alex Gleason <alex@alexgleason.me>
	Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
		1	2
lib/pleroma/web/twitter_api/controller.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/emails/user_email_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/user_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history
test/pleroma/web/twitter_api/twitter_api_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history