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.
indexable
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
ContextHelper
Co-authored-by: Puck Meerburg <puck@puck.moe>