Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users...
authorlain <lain@soykaf.club>
Wed, 29 Jul 2020 12:42:09 +0000 (14:42 +0200)
committerlain <lain@soykaf.club>
Wed, 29 Jul 2020 12:42:09 +0000 (14:42 +0200)
commitd9bf2c58df0a828901ab7cc66c5fd35d58a485ec
treeca5a82c8397de657c29084c183a71f1f5bb7b704
parentc25c21dd22202fe0fc827ef57e5a69631fa35bf7
parent269b61a2402e3d12d09baf26ba73359776f556b0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration
test/user_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs