mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-14 16:28:59 +00:00
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.