Claire fcc5262f60 Merge commit '93f3c724aea4efe874054b2f546fff91f0bf731b' into glitch-soc/merge-upstream
Conflicts:
- `spec/system/settings/preferences/appearance_spec.rb`:
  Upstream tests for changing themes in there, but glitch-soc has
  its own place for that.
  Updated upstream's change while skipping the theme test.
2025-01-27 18:19:09 +01:00
..
2024-10-31 15:12:08 +00:00
2023-06-06 10:42:47 +02:00
2024-11-22 14:43:16 +00:00