From: rinpatch <rinpatch@sdf.org>
Date: Thu, 12 Nov 2020 12:34:48 +0000 (+0000)
Subject: Merge branch 'release/2.2.0' into 'stable'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=1172844ed18d94d84724dc6f11c6e9f72e0ba6ec;p=akkoma

Merge branch 'release/2.2.0' into 'stable'

Release/2.2.0

See merge request pleroma/secteam/pleroma!19
---

1172844ed18d94d84724dc6f11c6e9f72e0ba6ec