mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-11-17 13:34:16 +00:00
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
|---|---|---|
| .. | ||
| account_relationships_presenter_spec.rb | ||
| familiar_followers_presenter_spec.rb | ||
| instance_presenter_spec.rb | ||
| status_relationships_presenter_spec.rb | ||