diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-01 08:49:32 +0300 |
| commit | baffdcc480cea13269ef0e3af58f0a848892bb9a (patch) | |
| tree | a9499083c412b24173fa14717cec7041c6f3f45c /lib/pleroma/application.ex | |
| parent | 642075b1a935c42181a10ea695b2289883126136 (diff) | |
| parent | dc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff) | |
| download | pleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.tar.gz | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index cc81e1805..782d1d589 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -110,7 +110,6 @@ defmodule Pleroma.Application do worker(Pleroma.Web.Federator.RetryQueue, []), worker(Pleroma.Stats, []), worker(Pleroma.Web.Push, []), - worker(Pleroma.Jobs, []), worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary) ] ++ streamer_child() ++ |