mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-13 15:58:50 +00:00
f7d1d73073
Conflicts: - `app/models/user_settings.rb`: Upstream added a new user setting, directly next to a glitch-soc-only one. The upstream setting would actually replace the glitch-soc one but it is not fully implemented yet, so have them side by side now. - `app/views/settings/preferences/appearance/show.html.haml`: Ditto. - `docker-compose.yml`: Conflict due to different registry names. Updated the version while keeping glitch-soc's registry.