Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some preferences to a new category, while glitch-soc had an extra preference there. Moved the extra preference like upstream did to the new category.
controllers/concerns
moved?
unprocessable_entity
unprocessable_content
expect
settings/*
scopes
/settings/applications
ExportSummary
User#login_activities