projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma...
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
controllers
/
invite_controller.ex
diff --git
a/lib/pleroma/web/admin_api/controllers/invite_controller.ex
b/lib/pleroma/web/admin_api/controllers/invite_controller.ex
index 7d169b8d29eeb9efa3ab16da562b89c3d26880f2..6a9b4038a13088d50f3823173b2811ef8baf8098 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/invite_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/invite_controller.ex
@@
-8,8
+8,8
@@
defmodule Pleroma.Web.AdminAPI.InviteController do
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
alias Pleroma.Config
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.UserInviteToken
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
require Logger