Merge branch 'lemmy-11936387' into 'main'

Mastodon [manual]

See merge request marius851000/fediverse-canvas-atlas-2024!379