fix merge

This commit is contained in:
Egor Kislitsyn 2019-01-31 15:23:50 +07:00
parent d3677d2b4d
commit 58e250d9d2

View file

@ -109,7 +109,7 @@ def start(_type, _args) do
worker(Pleroma.Stats, []), worker(Pleroma.Stats, []),
worker(Pleroma.Web.Push, []), worker(Pleroma.Web.Push, []),
worker(Pleroma.Jobs, []), worker(Pleroma.Jobs, []),
worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary) worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
] ++ ] ++
streamer_child() ++ streamer_child() ++
chat_child() ++ chat_child() ++