Merge branch 'release/2.2.1' into 'stable'
authorlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Dec 2020 13:35:41 +0000 (13:35 +0000)
Release/2.2.1

See merge request pleroma/pleroma!3214


Trivial merge