From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sun, 8 Aug 2021 14:40:51 +0000 (+0000)
Subject: Merge branch 'chores/2.4.0-develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c45b3bde949bbbd6b8d6de30022c1d1e5b99dc44;p=akkoma

Merge branch 'chores/2.4.0-develop' into 'develop'

Mergeback: 2.4.0

See merge request pleroma/pleroma!3494
---

c45b3bde949bbbd6b8d6de30022c1d1e5b99dc44