You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	1 year ago
workflows	Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream	1 year ago
renovate.json5	Fix `lint:json` not processing `json5` extension (#26481)	1 year ago
stale.yml	Change stale bot to only touch pull requests over 120 days old (#12217)	5 years ago
stylelint-matcher.json	Set-up Problem Matchers (#18598)	2 years ago