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)

Trivial merge