Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream reorganized the whole page, while glitch-soc had an extra setting. Adopted upstream's redesign and moved the extra setting where it made sense.
stylelint-config-standard-scss
@/