Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
check-i18n.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
linter.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
test-chart.yml	Correct prettier calls for YML/JSON (#21832)	2022-12-03 12:05:35 +09:00