Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sat, 5 May 2018 11:41:27 +0000 (13:41 +0200)
committerlain <lain@soykaf.club>
Sat, 5 May 2018 11:41:27 +0000 (13:41 +0200)

Trivial merge