mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-27 10:03:11 -05:00
69737b703a
Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.