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.
controllers/concerns
expect
settings/*
admin
ExportSummary
use_pack
layouts/theme
@theme