mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-11 18:22:53 -05:00
07eb31eeac
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.