Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
authorlain <lain@soykaf.club>
Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)
committerlain <lain@soykaf.club>
Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)
commitc7cdc553ff9bd7a068274d9b4b71008d9df04723
tree7b66d6b01ea9d0e82ec2b594e4549397230ce145
parent0d5bce018df9c99c771daaaa1de3ab0efc0cba5c
parent423ea497bb2a7225f4f0d0e1ebff93466b3ec124
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator