Claire ac2370778a Merge commit 'c676bc91e9' into glitch-soc/merge-upstream ... Conflicts: - `config/environments/production.rb`: Upstream enforced a code style change and glitch-soc had a few different lines. Applied upstream's code style to glitch-soc's changes.		2023-10-08 17:21:12 +02:00
..
development.rb	Improve Codespaces port forwarding (#26400)	2023-08-29 10:20:36 +02:00
production.rb	Merge commit 'c676bc91e9' into glitch-soc/merge-upstream	2023-10-08 17:21:12 +02:00
test.rb	Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793)	2023-09-05 15:37:23 +02:00