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.
pluck
DomainAllow.allowed_domains
disputes/strikes
filters/statuses
OAuth
settings/pictures
x.mastodon
LOCAL_DOMAIN
expect
intents
config_for
statuses