Merge branch 'issue/1218' into 'develop'
authorlain <lain@soykaf.club>
Wed, 25 Sep 2019 10:26:41 +0000 (10:26 +0000)
committerlain <lain@soykaf.club>
Wed, 25 Sep 2019 10:26:41 +0000 (10:26 +0000)
[#1218] Issue/1218

See merge request pleroma/pleroma!1609


Trivial merge