mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-09 00:12:13 -05:00
Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test.