aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-04-08 16:46:59 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-04-08 16:46:59 +0700
commitc3d5c3513a3205313f0a2e28bb328ad5b48f2055 (patch)
tree09ec548304cf3bbabba5a3b216c2d6769c9a6525 /lib/pleroma/application.ex
parenta1a854646e96598473ed7a323e034cf1f88ca508 (diff)
parentb177e1e7f330ff1531be190949db7f75e378a449 (diff)
downloadpleroma-c3d5c3513a3205313f0a2e28bb328ad5b48f2055.tar.gz
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index bd15034e0..eeb415084 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -104,7 +104,8 @@ defmodule Pleroma.Application do
],
id: :cachex_idem
),
- worker(Pleroma.FlakeId, [])
+ worker(Pleroma.FlakeId, []),
+ worker(Pleroma.ScheduledActivityWorker, [])
] ++
hackney_pool_children() ++
[