Claire 9765d2b3f8 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change.

2023-01-10 09:39:15 +01:00

642 B

Raw Blame History

View Raw