mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-02 04:50:39 -05: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. |
||
---|---|---|
.. | ||
credentials_controller_spec.rb | ||
familiar_followers_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
identity_proofs_controller_spec.rb | ||
lists_controller_spec.rb | ||
lookup_controller_spec.rb | ||
notes_controller_spec.rb | ||
pins_controller_spec.rb | ||
search_controller_spec.rb | ||
statuses_controller_spec.rb |