Claire 48827e1210 Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream ... - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. - `spec/helpers/application_helper_spec.rb`: Minor conflict due to glitch-soc's theming system.		2024-12-01 17:36:49 +01:00
..
development.rb	Restore stdout logging setting in development environment (#33057)	2024-11-24 20:00:37 +00:00
production.rb	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
test.rb	Update Rails to version 7.2.2 (#30391)	2024-11-07 14:58:20 +00:00