diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-14 02:01:10 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-14 02:01:10 +0000 |
| commit | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (patch) | |
| tree | 4b65347a97f158d3e1e6ee21074e8480a97ff536 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | 86871c8a04e8667dc86e9ef372701109ed853d00 (diff) | |
| parent | cc0f2f8ba3f8a8f2909722d34d95523218536267 (diff) | |
| download | pleroma-59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef.tar.gz | |
Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 75c2c6061..6d9bf2895 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -8,7 +8,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do use Pleroma.Web, :controller alias Pleroma.User alias Pleroma.Web.ActivityPub.Relay - alias Pleroma.Web.MastodonAPI.Admin.AccountView + alias Pleroma.Web.AdminAPI.AccountView import Pleroma.Web.ControllerHelper, only: [json_response: 3] |