mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 00:26:30 +00:00
Code Issues Projects Releases Wiki Activity

ActivityExpirationWorker: Fix merge issues.

Browse source
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)
def start_link do
def start_link(_) do
GenServer.start_link(__MODULE__, nil)
end

2
lib/pleroma/application.ex
View file

@ -36,7 +36,7 @@ defmodule Pleroma.Application do
Pleroma.Captcha,
Pleroma.FlakeId,
Pleroma.ScheduledActivityWorker,
Pleroma.ActiviyExpirationWorker
Pleroma.ActivityExpirationWorker
] ++
cachex_children() ++
hackney_pool_children() ++