mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-22 10:33:48 -05:00
Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our version.
Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our version.