Jeremy Kescher 122870cb6b Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # config/initializers/rack_attack.rb # lib/mastodon/version.rb		2022-11-14 22:18:48 +01:00
..
check-i18n.yml	ci: add minimum GitHub token permissions for workflows (#19138)	2022-09-08 09:44:24 +02:00
linter.yml	Fix typos (#18604)	2022-08-28 17:44:34 +02:00
test-chart.yml	helm: Add helm chart tests (#20394)	2022-11-13 22:22:07 +01:00