Merge branch 'release/2.1.1' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 8 Sep 2020 17:21:12 +0000 (17:21 +0000)
2.1.1 release

See merge request pleroma/secteam/pleroma!13


Trivial merge