mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-13 14:13:48 -05:00
Conflicts: - `app/views/settings/preferences/other/show.html.haml`: Upstream moved some settings, where glitch-soc has an extra setting. Ported upstream changes, moving the same settings as them.