Conflicts: - `yarn.lock`: Upstream updated dependencies, including one textually adjacent to a glitch-soc-only dependency. Updated dependencies as upstream did.
expect
Admin::ExportControllerConcern
HTTP::*
config_for
controllers/concerns
have_http_link_header
Account#unavailable?
Account#permanently_unavailable?
Style/SafeNavigation
Deprecation
DEFAULT_LOCALE
cache_*
preload_*
SignatureVerificationError
Mastodon