Merge branch 'chores/2.4.0-develop' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 8 Aug 2021 14:40:51 +0000 (14:40 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 8 Aug 2021 14:40:51 +0000 (14:40 +0000)
Mergeback: 2.4.0

See merge request pleroma/pleroma!3494


Trivial merge