Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)
committerlain <lain@soykaf.club>
Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)

Trivial merge