Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
authorlain <lain@soykaf.club>
Sun, 11 Mar 2018 13:43:53 +0000 (14:43 +0100)
committerlain <lain@soykaf.club>
Sun, 11 Mar 2018 13:43:53 +0000 (14:43 +0100)

Trivial merge