mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 06:17:33 +02:00
c48ec9cb8c
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 |