Jonathan G Rennison 5b7db9d849 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/command.cpp # src/company_cmd.cpp # src/company_gui.cpp # src/crashlog.cpp # src/economy.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/misc_gui.cpp # src/newgrf_config.cpp # src/openttd.cpp # src/settings_gui.cpp # src/ship_cmd.cpp # src/table/settings/gui_settings.ini		2022-05-15 13:54:13 +01:00
..
ci-build.yml	Merge branch 'master' into jgrpp	2022-05-15 13:54:13 +01:00
preview_build.yml	Update: bump actions/checkout from 2 to 3	2022-05-14 16:58:10 +02:00
preview_label.yml	Update: bump peter-evans/repository-dispatch from 1 to 2	2022-05-14 16:58:10 +02:00
preview_push.yml	Update: bump peter-evans/repository-dispatch from 1 to 2	2022-05-14 16:58:10 +02:00
release.yml	Merge branch 'master' into jgrpp	2022-05-15 13:54:13 +01:00
unused-strings.yml	Merge branch 'master' into jgrpp	2022-05-15 13:54:13 +01:00