alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ActivityExpirationWorker: Fix merge issues.

This commit is contained in:
lain 2019-08-24 17:22:26 +02:00
parent cc6c0b4ba6
commit 1692fa8945
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/activity_expiration_worker.ex
View File

@ -15,7 +15,7 @@ defmodule Pleroma.ActivityExpirationWorker do
@schedule_interval :timer.minutes(1) @schedule_interval :timer.minutes(1)
def start_link do def start_link(_) do
GenServer.start_link(__MODULE__, nil) GenServer.start_link(__MODULE__, nil)
end end

2
lib/pleroma/application.ex
View File

@ -36,7 +36,7 @@ def start(_type, _args) do
Pleroma.Captcha, Pleroma.Captcha,
Pleroma.FlakeId, Pleroma.FlakeId,
Pleroma.ScheduledActivityWorker, Pleroma.ScheduledActivityWorker,
Pleroma.ActiviyExpirationWorker Pleroma.ActivityExpirationWorker
] ++ ] ++
cachex_children() ++ cachex_children() ++
hackney_pool_children() ++ hackney_pool_children() ++