ActivityExpirationWorker: Fix merge issues.
authorlain <lain@soykaf.club>
Sat, 24 Aug 2019 15:22:26 +0000 (17:22 +0200)
committerlain <lain@soykaf.club>
Sat, 24 Aug 2019 15:22:26 +0000 (17:22 +0200)
commit1692fa89458f0f83f69ffa2f85a998869b8fe454
tree2d55897d351f538d52170d88c2de89adb202086e
parentcc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a
ActivityExpirationWorker: Fix merge issues.
lib/pleroma/activity_expiration_worker.ex
lib/pleroma/application.ex