Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expira...
authorlain <lain@soykaf.club>
Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)
committerlain <lain@soykaf.club>
Tue, 11 Aug 2020 15:49:24 +0000 (17:49 +0200)
commit0589e9156ac4f77bf158ed65bd352b4725f0ad1c
treebbe38007fbc918f96b46564a9af2e619d716f32f
parent677abbf0ee8d44f88e40f21526c401eb4ed8cc05
parentc66f6bd0ad130eb59c3c1e7edfbbddddf6772864
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again