Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
check-i18n.yml	See version file in GitHub Actions (#21927)	2022-12-07 00:30:59 +01:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
lint-json.yml	Move Prettier CI checks to filtered jobs (#22376)	2023-01-05 13:45:21 +01:00
lint-yml.yml	Move Prettier CI checks to filtered jobs (#22376)	2023-01-05 13:45:21 +01:00
linter.yml	Move Prettier CI checks to filtered jobs (#22376)	2023-01-05 13:45:21 +01:00
rebase-needed.yml	Add CI job to label PRs with merge conflicts (#22020)	2022-12-09 06:37:13 +01:00