Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 25 May 2020 14:52:03 +0000 (16:52 +0200)
committerlain <lain@soykaf.club>
Mon, 25 May 2020 14:52:03 +0000 (16:52 +0200)
commit2c25087d20e3b90c39affc8d7ad2a15a860334b4
tree23de2ebbadb81cf58a7b68ef467243723c01cf14
parentee35bb5ac287e0ff913685256a826e759add3fb9
parent6783d544b2d3856bda3f8f9136011923ee8b30fe
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms