diff options
| author | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
|---|---|---|
| committer | Ilja <domainepublic@spectraltheorem.be> | 2020-10-23 11:11:51 +0200 |
| commit | 3ca8feb24648dcee766cef958e84f758b0acec64 (patch) | |
| tree | a1b59cae266fa808aadbdf234146ede4aaa06b58 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | 513103829641faca5501d1d3123ce3c077d7da25 (diff) | |
| parent | 096e4518adf176c3f9cee0e38319340249083a48 (diff) | |
| download | pleroma-3ca8feb24648dcee766cef958e84f758b0acec64.tar.gz | |
fix merge conflict
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 |