diff options
author | lain <lain@soykaf.club> | 2020-08-24 15:55:07 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-24 15:55:07 +0200 |
commit | dd3ee3516cdae57616fca3f7cb90a24e7bf93843 (patch) | |
tree | af6dca70ee495978e35a59b241c04ff8d4641f72 /lib/pleroma/web/admin_api | |
parent | e8962dea5d3457a64616d085142578a1e3383f27 (diff) | |
parent | e1c8c599ff12699692ec7f06efc44064ee5ecb0b (diff) | |
download | pleroma-dd3ee3516cdae57616fca3f7cb90a24e7bf93843.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into matrix-explorations
Diffstat (limited to 'lib/pleroma/web/admin_api')
-rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 333e72e42..9c477feab 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -79,7 +79,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "confirmation_pending" => user.confirmation_pending, "approval_pending" => user.approval_pending, "url" => user.uri || user.ap_id, - "registration_reason" => user.registration_reason + "registration_reason" => user.registration_reason, + "actor_type" => user.actor_type } end |