Conflicts: - `app/javascript/styles/mastodon/components.scss`: Upstream removed some code that somehow had been modified in glitch-soc. Removed it as upstream did.
admin/users/two_factor_authentications
auth/passwords
disputes/strikes
filters/statuses
SystemHelpers
new_statuses
statuses_cleanup
statuses