mirror of
https://github.com/glitch-soc/mastodon.git
synced 2026-03-29 03:00:33 +02:00
Conflicts: - `app/models/form/admin_settings.rb`: Upstream added a method right next to glitch-soc-only methods. Added upstream's method. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream changed a line right next to a glitch-soc addition. Changed the code as upstream did.