tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
42a0898f1676156d90629e3d189fe0e04bc47fe9
Mastodon/spec/lib/feed_manager_spec.rb
Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00

22 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink