diff options
author | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-10-23 13:25:41 +0200 |
commit | 682f0aa2597bec4ef80691daddae1d87ddeeae0a (patch) | |
tree | c8ae5efb603e6b226ed3b5d39efb3912b63d17b9 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
parent | 346a59aee68d71af5d7ab6cfb9ff89008a032f2b (diff) | |
parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
download | pleroma-682f0aa2597bec4ef80691daddae1d87ddeeae0a.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2061-chat-deletion
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index d5713c3dd..bdd3e195d 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -10,7 +10,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do alias Pleroma.Config alias Pleroma.MFA alias Pleroma.ModerationLog - alias Pleroma.Plugs.OAuthScopesPlug alias Pleroma.Stats alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub @@ -21,6 +20,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do alias Pleroma.Web.AdminAPI.ModerationLogView alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.Endpoint + alias Pleroma.Web.Plugs.OAuthScopesPlug alias Pleroma.Web.Router @users_page_size 50 |