Merge branch 'mergeback/2.2.2' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Tue, 19 Jan 2021 10:00:15 +0000 (10:00 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 19 Jan 2021 10:00:15 +0000 (10:00 +0000)
Mergeback/2.2.2

See merge request pleroma/pleroma!3264


Trivial merge