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
..
development.rb	Fix warnings on Rails boot (#16946)	2021-12-27 00:47:20 +01:00
production.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-26 22:32:21 +01:00
test.rb	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00