mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-15 23:23:50 -05:00
Conflicts: - `config/initializers/cors.rb`: Upstream refactored this file, and glitch-soc had local changes. I could not find the rationale for the glitch-soc changes, so I used upstream's version.