From: rinpatch <rinpatch@sdf.org>
Date: Tue, 19 Jan 2021 10:00:15 +0000 (+0000)
Subject: Merge branch 'mergeback/2.2.2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=984426d9c4cadc59017c6770b033f4d72e497342;p=akkoma

Merge branch 'mergeback/2.2.2' into 'develop'

Mergeback/2.2.2

See merge request pleroma/pleroma!3264
---

984426d9c4cadc59017c6770b033f4d72e497342