projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/answer-outbox' into 'develop'
[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 47b7d99534edc7601fafa316c97736a5864a97bf..3f233a0c48a8e0fd2bb896bc499da070a6709996 100644
(file)
--- a/
lib/pleroma/web/admin_api/controllers/invite_controller.ex
+++ b/
lib/pleroma/web/admin_api/controllers/invite_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.InviteController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.InviteController do
@@
-8,8
+8,8
@@
defmodule Pleroma.Web.AdminAPI.InviteController do
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
alias Pleroma.Config
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
alias Pleroma.Config
- alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.UserInviteToken
alias Pleroma.UserInviteToken
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
require Logger
require Logger