mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 12:13:18 -05:00
42f36aa55a
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.