Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions. |
||
|---|---|---|
| .. | ||
| counters_spec.rb | ||
| finder_concern_spec.rb | ||
| interactions_spec.rb | ||
| sensitizes_spec.rb | ||
| silences_spec.rb | ||
| statuses_search_spec.rb | ||
| suspensions_spec.rb | ||