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