Merge branch 'release/2.1.0' into 'stable'
authorlain <lain@soykaf.club>
Fri, 28 Aug 2020 12:17:19 +0000 (12:17 +0000)
committerlain <lain@soykaf.club>
Fri, 28 Aug 2020 12:17:19 +0000 (12:17 +0000)
Release/2.1.0

See merge request pleroma/pleroma!2927


Trivial merge