mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-27 13:50:45 -04:00
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.