Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01: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
2023-04-09 11:25:30 +02:00