Claire 43a0d704fb Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.		2023-01-14 22:34:09 +01:00
..
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-14 22:34:09 +01:00