aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-05 15:21:00 +0100
committerlain <lain@soykaf.club>2019-11-05 15:21:00 +0100
commit1bd1f62af55e01613e6362661b36a19091c87424 (patch)
tree519963a50af82c1a0b251f1405d663ba9ccd4714 /lib/pleroma/application.ex
parentfaced6236b9e2ce9675cf743068f16098b744562 (diff)
parentf11eebc18383be7d7b4b037582e4e1e08b74653b (diff)
downloadpleroma-1bd1f62af55e01613e6362661b36a19091c87424.tar.gz
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex10
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