Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
2024-06-17 18:30:28 +02:00
..
2024-05-24 08:36:21 +00:00
2023-06-06 10:42:47 +02:00
2023-10-23 17:58:29 +00:00
2020-10-12 16:33:49 +02:00