Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.
/api/v1/admin/account_actions
/api/v1/emails/check_confirmation
rewhere