mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-31 14:31:43 +01:00
69737b703a
Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.