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)
commit1172844ed18d94d84724dc6f11c6e9f72e0ba6ec
tree7d48a259e08856ab6db0eba255f20c0c19410463
parenta0f5e8b27edbe2224d9c2c3997ad5b8ea484244b
parentb4c6b262d6dc12362f0014a864e8aed6c727c39c
Merge branch 'release/2.2.0' into 'stable'

Release/2.2.0

See merge request pleroma/secteam/pleroma!19