Conflicts: - `app/controllers/follower_accounts_controller.rb`: Upstream refactored a part of the code where glitch-soc has changed the code to potentially hide followers count. Adapt upstream's changes.
expect
Admin::ExportControllerConcern
outgoing_quotes
controllers/concerns
have_http_link_header
Style/SafeNavigation
Deprecation
DEFAULT_LOCALE
cache_*
preload_*