diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-04 20:50:28 +0700 |
| commit | 3a3a3996b7a37d281745586fa40bbabd5299a1ce (patch) | |
| tree | 843d5295c820fef6d5112677dd1145b3757ad2ac /lib/pleroma/web/websub/websub_controller.ex | |
| parent | 58e250d9d27205116df5634d909ec1e43ea55286 (diff) | |
| parent | 89762ad23034668f7440c9fb238dcf270e8c2e59 (diff) | |
| download | pleroma-3a3a3996b7a37d281745586fa40bbabd5299a1ce.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
Diffstat (limited to 'lib/pleroma/web/websub/websub_controller.ex')
| -rw-r--r-- | lib/pleroma/web/websub/websub_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex index eb10227cb..41bbc0369 100644 --- a/lib/pleroma/web/websub/websub_controller.ex +++ b/lib/pleroma/web/websub/websub_controller.ex @@ -4,9 +4,11 @@ defmodule Pleroma.Web.Websub.WebsubController do use Pleroma.Web, :controller + alias Pleroma.{Repo, User} alias Pleroma.Web.{Websub, Federator} alias Pleroma.Web.Websub.WebsubClientSubscription + require Logger plug( |