aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-13 09:54:29 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-13 09:54:29 -0500
commit409f694e4f90d34285b43c7e7afc594bc386d893 (patch)
tree70d3283bcc7e565ba37b253c7cd7dbb94b9d9aa3 /lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
parent9968b7efedc64d0239db5578de7fc66ff4ce894d (diff)
parent8b6221d4ecd1d7e354e7de831dd46e285cb85077 (diff)
downloadpleroma-409f694e4f90d34285b43c7e7afc594bc386d893.tar.gz
Merge branch 'develop' into refactor/locked_user_field
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/instance_document_controller.ex')
-rw-r--r--lib/pleroma/web/admin_api/controllers/instance_document_controller.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
index 504d9b517..37dbfeb72 100644
--- a/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
@@ -5,9 +5,9 @@
defmodule Pleroma.Web.AdminAPI.InstanceDocumentController do
use Pleroma.Web, :controller
- alias Pleroma.Plugs.InstanceStatic
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Web.InstanceDocument
+ alias Pleroma.Web.Plugs.InstanceStatic
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(Pleroma.Web.ApiSpec.CastAndValidate)