Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
ISSUE_TEMPLATE	Improve the bug report templates (#25621)	2023-07-21 10:46:12 +02:00
actions	Update `actions/cache` to v4 (updates node 16->20) (#29025)	2024-01-31 16:55:50 +00:00
workflows	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
codecov.yml	Improve codecov config (#27860)	2023-11-15 09:20:24 +00:00
renovate.json5	Merge commit '7d9b209fe84b00eff348ea9d54905cbfffa79788' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
stale.yml	…
stylelint-matcher.json	…