diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-15 17:11:00 +0300 |
| commit | 273905744242b013ba9736ff7e1415a0499022d1 (patch) | |
| tree | 146f5ad5428130dce0076ea9f6398035d7ac88f6 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | aacbf0f57053786533df045125dee93ace0daa93 (diff) | |
| parent | 41fc67aa4993c119dae82578df7309d3999ac47a (diff) | |
| download | pleroma-273905744242b013ba9736ff7e1415a0499022d1.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
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] |