Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Thu, 9 Apr 2020 11:25:27 +0000 (13:25 +0200)
committerlain <lain@soykaf.club>
Thu, 9 Apr 2020 11:25:27 +0000 (13:25 +0200)
commitd35e114acddf339ed398aeab02bf94abe229ac36
treee35bbf60afa823fd1fdf2b0366249a31f040cd29
parent8e637ae1a7b75fa08679ae9cf424650fc105de85
parentb87b798ca1660224a3192c32b035c19b18e11587
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms