Merge branch 'release/2.2.2' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Mon, 18 Jan 2021 14:33:28 +0000 (14:33 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 18 Jan 2021 14:33:28 +0000 (14:33 +0000)
Release/2.2.2

See merge request pleroma/pleroma!3216


Trivial merge