Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
2026-04-25 09:20:39 +02:00
..
2026-03-25 14:38:35 +00:00
2025-09-30 13:06:02 +00:00
2026-04-23 07:48:00 +00:00
2026-03-25 14:38:35 +00:00