Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.
/api/v1/emails/check_confirmation
/instances/*
Api::V1::ProfilesController
default_scope
StatusEdit
Naming/MemoizedInstanceVariableName
GET /api/v1/directory
forward_to_domains
POST /api/v1/reports