mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-26 10:04:20 -05:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
activity | ||
adapter_spec.rb | ||
dereferencer_spec.rb | ||
linked_data_signature_spec.rb | ||
tag_manager_spec.rb |