Claire fbfc4145fd Merge commit '1cdcd9dc08' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there.		2023-08-24 21:01:19 +02:00
..
show.html.haml	Merge commit '1cdcd9dc08' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00