Merge branch 'release/2.2.0' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Thu, 12 Nov 2020 12:34:48 +0000 (12:34 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 12 Nov 2020 12:34:48 +0000 (12:34 +0000)
Release/2.2.0

See merge request pleroma/secteam/pleroma!19


Trivial merge