mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-20 22:52:56 -05:00
b8209c3b96
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.