Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 1 Jun 2020 11:34:13 +0000 (13:34 +0200)
committerlain <lain@soykaf.club>
Mon, 1 Jun 2020 11:34:13 +0000 (13:34 +0200)
commit8ff342582839259f3b8e039c6b3da3c0cf798a1f
treea8bcf55b11431880be23a3185631d937e15aeb97
parent6ff079ca9f1869ecc0789f8d684e8ea2959ccf1e
parente96765df6b04fe5e9766271a9c62e559392758b2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms