Conflicts: - `app/models/trends/statuses.rb`: Upstream added a condition where glitch-soc had changes on the same line. Adapted upstream's changes.
Conflicts: - `app/models/trends/statuses.rb`: Upstream added a condition where glitch-soc had changes on the same line. Adapted upstream's changes.