diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-10 10:45:33 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-10 10:45:33 +0300 |
| commit | 2f65e1b059ccd75478218f505c8010c32dfdbca6 (patch) | |
| tree | dbdfcf6d9ac5339b7d981832f9c3db73f10daebd /lib | |
| parent | 235a949d3b1038320cfe54a5bb55d944a2b4a1e7 (diff) | |
| parent | 1b746cfbbb55cd3411e809ead246c752a43361d0 (diff) | |
| download | pleroma-2f65e1b059ccd75478218f505c8010c32dfdbca6.tar.gz | |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib')
| -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 120159527..e1e929632 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -76,7 +76,8 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "local" => user.local, "roles" => User.roles(user), "tags" => user.tags || [], - "confirmation_pending" => user.confirmation_pending + "confirmation_pending" => user.confirmation_pending, + "url" => user.uri || user.ap_id } end |