Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 24 Mar 2018 10:03:33 +0000 (11:03 +0100)
committerlain <lain@soykaf.club>
Sat, 24 Mar 2018 10:03:33 +0000 (11:03 +0100)

Trivial merge