From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sun, 29 Aug 2021 18:51:50 +0000 (+0000)
Subject: Merge branch 'chores/2.4.1-develop' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=2e695dbe3b81860988e3cac2bf18cb63c57148d2;hp=-c;p=akkoma

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

Mergeback: 2.4.1

Closes #2758

See merge request pleroma/pleroma!3520
---

2e695dbe3b81860988e3cac2bf18cb63c57148d2