Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated its README, we have a completely different one. Kept ours. - `app/views/auth/sessions/two_factor.html.haml`: Upstream refactored stuff and the conflict is because of glitch-soc's theming system. Ported upstream changes while accounting for the different theming system.		2023-10-17 20:59:18 +02:00
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
workflows	Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream	2023-10-08 17:05:40 +02:00
renovate.json5	Fix `lint:json` not processing `json5` extension (#26481)	2023-08-14 14:53:13 +02:00
stale.yml	…
stylelint-matcher.json	…