diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-26 22:32:21 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-26 22:32:21 +0100 |
| commit | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (patch) | |
| tree | 70af45c80f67391c46c55425c64b33da9467fedb /app/javascript/locales | |
| parent | 58930199379305e718d57b48488cc752b452e72a (diff) | |
| parent | 166cc5b89d60f8e2e1f748df86ff8a9003a4876e (diff) | |
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'.
Diffstat (limited to 'app/javascript/locales')
0 files changed, 0 insertions, 0 deletions