Claire 0f90e624c5 Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes.
2024-05-01 16:10:45 +02:00
..
2017-07-08 00:06:02 +02:00
2023-06-05 09:37:02 +02:00
2023-09-22 16:41:50 +02:00