mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-03-27 05:40:45 -04: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.