Merge branch 'chores/2.4.1-develop' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 29 Aug 2021 18:51:50 +0000 (18:51 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 29 Aug 2021 18:51:50 +0000 (18:51 +0000)
commit2e695dbe3b81860988e3cac2bf18cb63c57148d2
treee1c31c9ca49c14860af2adaaf4f20ac99ec330f5
parent689a59f41f265c08f1aae9784b05747811956775
parent28a17c2dc70f33734aceeb499f38cb804489788f
Merge branch 'chores/2.4.1-develop' into 'develop'

Mergeback: 2.4.1

Closes #2758

See merge request pleroma/pleroma!3520