Claire dfe851b476 Merge branch 'stable-4.3' into glitch-soc/backports-4.3
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
2024-10-05 20:45:05 +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