mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02:00
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.