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
..
2024-11-26 07:19:48 +00:00