mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-08 16:02:14 -05:00
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.