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
..
2021-11-01 18:54:43 +00:00
2022-05-15 13:54:13 +01:00
2021-08-15 14:14:13 +02:00
2019-08-31 21:20:24 +02:00
2021-08-22 14:27:48 +02:00
2019-01-24 21:57:06 +01:00
2021-09-02 22:32:10 +02:00