Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 16 Apr 2020 13:28:08 +0000 (15:28 +0200)
committerlain <lain@soykaf.club>
Thu, 16 Apr 2020 13:28:08 +0000 (15:28 +0200)
commit41fdcb72828d52a23d57c41f910b02da5156e979
tree7b0c5a2dcf7401463652099059963bc0d668183f
parentca598e9c27a7a66b014523845e62046d19364f2f
parent2b57f73b776d0de3c91b3b0dd19e4458c205f690
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms