Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat...
authorlain <lain@soykaf.club>
Wed, 4 Dec 2019 13:25:00 +0000 (14:25 +0100)
committerlain <lain@soykaf.club>
Wed, 4 Dec 2019 13:25:00 +0000 (14:25 +0100)
commit24599c519f95f27e1fb8120104f13856d2fa3742
treee400a887b02414599756879d7cbc3b895a9ea1d3
parent9487995e8b2172bd720d17d639d5d782d38a45a2
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit