mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 14:49:01 +09:00
b8209c3b96
Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now. |
||
---|---|---|
.. | ||
appeals_controller.rb | ||
base_controller.rb | ||
strikes_controller.rb |