diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-09-30 19:10:54 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-09-30 19:10:54 +0700 |
| commit | e7aef27c0011d3fd0b569ebdb9196a1e011eae5d (patch) | |
| tree | 2cfe7b23d75256ccde619b6cc1b4b6a9f813dfc8 /lib/pleroma/web/admin_api | |
| parent | 3f0e276ac94589d860c7e4c95d3661fa494f4361 (diff) | |
| download | pleroma-e7aef27c0011d3fd0b569ebdb9196a1e011eae5d.tar.gz | |
Fix merge
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/views/report_view.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/views/report_view.ex b/lib/pleroma/web/admin_api/views/report_view.ex index 8c06364a3..101a74c63 100644 --- a/lib/pleroma/web/admin_api/views/report_view.ex +++ b/lib/pleroma/web/admin_api/views/report_view.ex @@ -43,7 +43,7 @@ defmodule Pleroma.Web.AdminAPI.ReportView do end defp merge_account_views(%User{} = user) do - Pleroma.Web.MastodonAPI.AccountView.render("account.json", %{user: user}) + Pleroma.Web.MastodonAPI.AccountView.render("show.json", %{user: user}) |> Map.merge(Pleroma.Web.AdminAPI.AccountView.render("show.json", %{user: user})) end |