Merge remote-tracking branch 'upstream/develop' into registration-workflow
authorAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
committerAlex Gleason <alex@alexgleason.me>
Wed, 14 Oct 2020 00:20:00 +0000 (19:20 -0500)
commitc3112fd13a6af239b9dff0813e93266ec58f571e
tree7f2252d7a08e4a59b66e392b2732a1cdd8745758
parent66e00ace7c0708f2f9361bc6e1008ccea08cb6ef
parent481906207e6d803e5c4d3e455c7b93119e392177
Merge remote-tracking branch 'upstream/develop' into registration-workflow
lib/pleroma/web/twitter_api/controller.ex
test/pleroma/emails/user_email_test.exs
test/pleroma/user_test.exs
test/pleroma/web/twitter_api/twitter_api_test.exs