aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-10-13 19:20:00 -0500
committerAlex Gleason <alex@alexgleason.me>2020-10-13 19:20:00 -0500
commitc3112fd13a6af239b9dff0813e93266ec58f571e (patch)
tree7f2252d7a08e4a59b66e392b2732a1cdd8745758 /lib/pleroma/web/admin_api/controllers/instance_document_controller.ex
parent66e00ace7c0708f2f9361bc6e1008ccea08cb6ef (diff)
parent481906207e6d803e5c4d3e455c7b93119e392177 (diff)
downloadpleroma-c3112fd13a6af239b9dff0813e93266ec58f571e.tar.gz
Merge remote-tracking branch 'upstream/develop' into registration-workflow
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)