Merge branch 'release/2.4.0' into 'stable'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 8 Aug 2021 14:37:15 +0000 (14:37 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 8 Aug 2021 14:37:15 +0000 (14:37 +0000)
Release/2.4.0

See merge request pleroma/pleroma!3493


Trivial merge