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
..
ISSUE_TEMPLATE	Merge branch 'master' into jgrpp-beta	2021-11-01 18:54:43 +00:00
workflows	Merge branch 'master' into jgrpp	2022-05-15 13:54:13 +01:00
changelog.sh	Fix: [Actions] changelog assumed major.minor.patch versioning (#9482)	2021-08-15 14:14:13 +02:00
FUNDING.yml
PULL_REQUEST_TEMPLATE.md	Doc: guidelines on english.txt or translation changes in PRs. (#9505)	2021-08-22 14:27:48 +02:00
stale.yml
unused-strings.py	Codechange: validate that all STR_NNN strings are defined and used (#9518)	2021-09-02 22:32:10 +02:00