mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-12 10:42:55 -05:00
0b2c7cdb02
Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.