mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-15 23:23:50 -05:00
Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.