diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-02-11 13:54:21 +0700 |
| commit | 305d2194136d4560e02c110d528164034d3727b2 (patch) | |
| tree | 40510e1c4dc0140ff16e2fdc483da64c83b7077c /lib/pleroma/web/websub/websub.ex | |
| parent | 5b1d7c3c5672af065af503891d156b6e0cf5a8c1 (diff) | |
| parent | 06c4935c11fc58f5ede18706bc46dcc502e64052 (diff) | |
| download | pleroma-305d2194136d4560e02c110d528164034d3727b2.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
Diffstat (limited to 'lib/pleroma/web/websub/websub.ex')
| -rw-r--r-- | lib/pleroma/web/websub/websub.ex | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex index 82845f13d..c00ec0858 100644 --- a/lib/pleroma/web/websub/websub.ex +++ b/lib/pleroma/web/websub/websub.ex @@ -4,12 +4,16 @@ defmodule Pleroma.Web.Websub do alias Ecto.Changeset - alias Pleroma.Repo alias Pleroma.Instances - alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription} + alias Pleroma.Repo + alias Pleroma.Web.Websub.WebsubServerSubscription + alias Pleroma.Web.Websub.WebsubClientSubscription alias Pleroma.Web.OStatus.FeedRepresenter - alias Pleroma.Web.{XML, Endpoint, OStatus, Federator} + alias Pleroma.Web.XML + alias Pleroma.Web.Endpoint + alias Pleroma.Web.OStatus alias Pleroma.Web.Router.Helpers + alias Pleroma.Web.Federator require Logger import Ecto.Query |