Claire 59864ff495 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.		2022-03-22 17:00:38 +01:00
..
_appeal.html.haml	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
index.html.haml	Fix issue with glitch-soc's theming system	2022-02-17 10:59:01 +01:00