Claire 06b1f8bd85 Merge commit '8224178e8ca9746f97ce341179d2c636fa22a082' into glitch-soc/merge-upstream
Conflicts:
- `app/models/trends/statuses.rb`:
  Upstream added a condition where glitch-soc had changes on the same line.
  Adapted upstream's changes.
2025-06-02 20:05:43 +02:00
..
2024-10-30 14:38:10 +00:00
2025-05-23 06:43:02 +00:00
2025-02-27 15:44:35 +01:00