Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 21 Apr 2018 16:28:24 +0000 (18:28 +0200)
committerlain <lain@soykaf.club>
Sat, 21 Apr 2018 16:28:24 +0000 (18:28 +0200)

Trivial merge