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-17 09:18:54 +00:00
2017-11-24 02:05:53 +01:00
2023-04-09 11:25:30 +02:00
2024-05-20 09:37:36 +00:00
2020-06-02 19:24:53 +02:00