mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-05 06:23:10 -05:00
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.