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)
commitc45b3bde949bbbd6b8d6de30022c1d1e5b99dc44
tree14b4ef434f64bf6682672b544e4f1366a5e411f0
parent5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0
parent8f730f70cb2485383425cdafff5636698fc49d0a
Merge branch 'chores/2.4.0-develop' into 'develop'

Mergeback: 2.4.0

See merge request pleroma/pleroma!3494