Files
mastodon/spec
Claire 449dc30739 Merge commit 'c43508b3e0b05c5e739d726bad53f1eef89e9376' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Upstream added support for `EXTRA_MEDIA_HOSTS` which is very similar to
  glitch-soc's `EXTRA_DATA_HOST`.
  Deprecate `EXTRA_DATA_HOST` FOR `EXTRA_MEDIA_HOST`.
2025-03-26 19:14:26 +01:00
..