Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880
authorlain <lain@soykaf.club>
Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)
committerlain <lain@soykaf.club>
Wed, 8 Jul 2020 11:21:58 +0000 (13:21 +0200)
commitcdc153db31a466063db85cfa4b73f3e174653b89
treef5aa068895c95349381a1896857fa8fd1cb83f2c
parente341f817850e51a29ec45607563323b6660f8da4
parent6335b32aa8f5c54cf5f09638189a77cad5785077
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/1880