mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-25 20:06:30 +00:00
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.