diff options
author | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-10-18 16:04:57 +0000 |
commit | 4053a82f41691195d1b29cc9eb3f6ed6814ee12f (patch) | |
tree | 31075bdd659c45b688e3b670acc5c9b41a7abc63 /lib/pleroma/application.ex | |
parent | 223c0c0136be81a363b114538948e8e0317540af (diff) | |
parent | c2ae6310dc09e65515c7b8774d2b85b5ef7da1a1 (diff) | |
download | pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.tar.gz |
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal
Closes #1145
See merge request pleroma/pleroma!1854
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r-- | lib/pleroma/application.ex | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 0bf218bc7..d681eecc8 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -161,11 +161,6 @@ defmodule Pleroma.Application do id: :web_push_init, start: {Task, :start_link, [&Pleroma.Web.Push.init/0]}, restart: :temporary - }, - %{ - id: :federator_init, - start: {Task, :start_link, [&Pleroma.Web.Federator.init/0]}, - restart: :temporary } ] end @@ -178,11 +173,6 @@ defmodule Pleroma.Application do restart: :temporary }, %{ - id: :federator_init, - start: {Task, :start_link, [&Pleroma.Web.Federator.init/0]}, - restart: :temporary - }, - %{ id: :internal_fetch_init, start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]}, restart: :temporary |