Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 6 Apr 2020 15:50:31 +0000 (17:50 +0200)
committerlain <lain@soykaf.club>
Mon, 6 Apr 2020 15:50:31 +0000 (17:50 +0200)
commit19335be24c25739e2334180af6c59dd8919d5fc8
treedb34531b2dd5befb495d4379aa8aaad9284fa72c
parentfd97b0e634d30dec3217efcf3d67610d1b54bf8b
parent1d4ab06505ec5143dbb1d78d718fa9efd1497751
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms