mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-13 11:13:05 -05:00
59864ff495
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.