blueb-Chuckya-fe-standalone/app/views/admin/settings/discovery
Claire b8209c3b96 Merge commit '85662a5a57' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
..
show.html.haml Merge commit '85662a5a57' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00