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

Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.

2022-01-26 22:32:21 +01:00

5.2 KiB

Raw Blame History

View Raw