mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
Conflicts: - `app/models/user_settings.rb`: Not a real conflict, upstream added a setting on a line adjacent to a glitch-soc-only line. Added upstream's new setting.