mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-15 07:03:49 -05:00
Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.