Conflicts: - `app/serializers/activitypub/note_serializer.rb`: Conflict because upstream added context extensions where glitch-soc had its own. Added upstream's new context extension while keeping ours.
activitypub/*
disputes/strikes
filters/statuses
OAuth
settings/pictures
x.mastodon
LOCAL_DOMAIN
intents
config_for