Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma...
authorlain <lain@soykaf.club>
Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)
committerlain <lain@soykaf.club>
Tue, 11 Aug 2020 08:55:10 +0000 (10:55 +0200)
commit677abbf0ee8d44f88e40f21526c401eb4ed8cc05
tree7669034cb73935b8f9fde9df419d33cd56117346
parent7e4932362b7e672b08543cfd189deb3776268fe3
parent024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again