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 https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
websub
/
websub_controller.ex
diff --git
a/lib/pleroma/web/websub/websub_controller.ex
b/lib/pleroma/web/websub/websub_controller.ex
index ad40f1b9471f5ddbbbf601fa1c5967e55f933a3e..9e8b48b80c2c94479cbb2e7873193935bbaa56e4 100644
(file)
--- a/
lib/pleroma/web/websub/websub_controller.ex
+++ b/
lib/pleroma/web/websub/websub_controller.ex
@@
-7,8
+7,8
@@
defmodule Pleroma.Web.Websub.WebsubController do
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.User
- alias Pleroma.Web.Websub
alias Pleroma.Web.Federator
alias Pleroma.Web.Federator
+ alias Pleroma.Web.Websub
alias Pleroma.Web.Websub.WebsubClientSubscription
require Logger
alias Pleroma.Web.Websub.WebsubClientSubscription
require Logger