Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test.
UserMailer
application_id
ScheduledStatusSerializer
Status::Visibility
rails
likes
shares