projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable' into mergeback/2.2.2
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controllers
/
util_controller.ex
diff --git
a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index f97bd482333c438c41f6af57c8a2de792ef9fffe..1e252f7bb7b72bc6d1e21452cc2d6277e9c3ac35 100644
(file)
--- a/
lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/
lib/pleroma/web/twitter_api/controllers/util_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.TwitterAPI.UtilController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.UtilController do
@@
-11,9
+11,9
@@
defmodule Pleroma.Web.TwitterAPI.UtilController do
alias Pleroma.Emoji
alias Pleroma.Healthcheck
alias Pleroma.Notification
alias Pleroma.Emoji
alias Pleroma.Healthcheck
alias Pleroma.Notification
- alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.User
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.WebFinger
plug(Pleroma.Web.Plugs.FederatingPlug when action == :remote_subscribe)
alias Pleroma.Web.WebFinger
plug(Pleroma.Web.Plugs.FederatingPlug when action == :remote_subscribe)