mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.