mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 04:03:06 -05:00
e193c848fe
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream added some code to add the Identity Provider's sign-in endpoint to the `form-action` Content Security Policy directive but our version of the file is pretty different. Ported the change.