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
..
2017-11-17 19:29:16 -08:00
2024-11-22 08:58:04 +00:00
2024-09-26 14:26:04 +00:00