Merge branch 'develop' into refactor/approval_pending_user_field
authorMark Felder <feld@feld.me>
Mon, 18 Jan 2021 18:05:05 +0000 (12:05 -0600)
committerMark Felder <feld@feld.me>
Mon, 18 Jan 2021 18:05:05 +0000 (12:05 -0600)
commit44a86951a339fdb0146a237ca5178c83823629c7
treee38ad0c1ecf198a69762dfc95f158e649d9d4723
parent63923df0a51fdae58daf71a8dd85929a29ab1546
parent0ad6ea205711df9d1c634f0ad2dde6d432544318
Merge branch 'develop' into refactor/approval_pending_user_field
lib/pleroma/user.ex
lib/pleroma/user/query.ex
lib/pleroma/web/admin_api/views/account_view.ex
test/pleroma/user_test.exs
test/pleroma/web/admin_api/controllers/user_controller_test.exs
test/pleroma/web/admin_api/search_test.exs
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
test/pleroma/web/o_auth/o_auth_controller_test.exs
test/pleroma/web/twitter_api/twitter_api_test.exs