Claire 490417762f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2022-06-28 11:11:18 +02:00
..
build-image.yml	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
check-i18n.yml	Bump actions/checkout from 2 to 3 (#18679)	2022-06-19 14:38:07 +09:00
linter.yml	Set-up Problem Matchers (#18598)	2022-06-16 22:09:43 +02:00