Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)
committerlain <lain@soykaf.club>
Sat, 2 Jun 2018 13:39:21 +0000 (15:39 +0200)

Trivial merge