mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-14 03:32:56 -05:00
afc3b12217
Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.