Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
check-i18n.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
codeql.yml	Add CodeQL workflow (#21894)	2022-12-15 15:51:13 +01:00
linter.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
rebase-needed.yml	Add CI job to label PRs with merge conflicts (#22020)	2022-12-09 06:37:13 +01:00