From: lain <lain@soykaf.club>
Date: Wed, 23 Dec 2020 13:35:41 +0000 (+0000)
Subject: Merge branch 'release/2.2.1' into 'stable'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f64237927c05173e4f29dbbd2a563f123690da7e;p=akkoma

Merge branch 'release/2.2.1' into 'stable'

Release/2.2.1

See merge request pleroma/pleroma!3214
---

f64237927c05173e4f29dbbd2a563f123690da7e