mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 14:42:58 -05:00
fdd0beefa7
Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.