Claire 2b0410f903 Merge commit 'f7aab0cc2ff47337021d50ed52428abcb7a9b518' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-18 17:19:57 +02:00
..
2024-09-18 08:43:24 +00:00
2017-07-08 00:06:02 +02:00
2023-09-22 16:41:50 +02:00