mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 11:11:11 +02:00
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream changed a field that was moved to another page due to glitch-soc's theming system. Ignored this one change.