From: lain <lain@soykaf.club>
Date: Wed, 23 Dec 2020 14:08:08 +0000 (+0000)
Subject: Merge branch 'mergeback/2.2.1' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ce1be8f5e6feabee4acac376dce23f0ec18e62ec;p=akkoma

Merge branch 'mergeback/2.2.1' into 'develop'

Mergeback/2.2.1

See merge request pleroma/pleroma!3215
---

ce1be8f5e6feabee4acac376dce23f0ec18e62ec