diff options
| author | feld <feld@feld.me> | 2020-10-13 14:47:29 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-13 14:47:29 +0000 |
| commit | 8b6221d4ecd1d7e354e7de831dd46e285cb85077 (patch) | |
| tree | 992e96bbdf4b40a5738ca2306ba3acf4158b17d5 /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | |
| parent | eea879eb362d3310d4fe047fb6412b69dd8711fe (diff) | |
| parent | 4c4ea9a3486f824cfba825a176439d50ec54fe95 (diff) | |
| download | pleroma-8b6221d4ecd1d7e354e7de831dd46e285cb85077.tar.gz | |
Merge branch 'feature/1822-files-consistency' into 'develop'
Feature/1822 files consistency
Closes #1822
See merge request pleroma/pleroma!2680
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 |