Merge branch 'release/1.1.8' into 'stable'
authorlain <lain@soykaf.club>
Fri, 10 Jan 2020 12:44:31 +0000 (12:44 +0000)
committerlain <lain@soykaf.club>
Fri, 10 Jan 2020 12:44:31 +0000 (12:44 +0000)
Release/1.1.8

See merge request pleroma/pleroma!2096


Trivial merge