Claire 30ee7339d3 Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream changed code style change, including on a line modified by glitch-soc.
  Kept glitch-soc's line but with the code style change applied.
2023-12-21 19:31:12 +01:00
..
2023-06-06 10:42:47 +02:00
2023-10-23 17:58:29 +00:00
2020-10-12 16:33:49 +02:00
2023-04-09 11:25:30 +02:00