Merge branch 'release/2.1.2' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)
Release/2.1.2

See merge request pleroma/secteam/pleroma!17


Trivial merge