Claire f2b23aa5f3 Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream
Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes.
2024-04-06 19:35:21 +02:00
..
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00