Jonathan G Rennison 650d5e014e Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_gui.cpp # src/company_cmd.cpp # src/lang/estonian.txt # src/lang/german.txt # src/lang/hungarian.txt # src/lang/korean.txt # src/lang/slovak.txt # src/main_gui.cpp # src/video/sdl2_v.cpp		2021-02-01 19:34:30 +00:00
..
workflows	Merge branch 'master' into jgrpp	2021-02-01 19:34:30 +00:00
changelog.sh	Add: [Actions] release workflow for both releases and nightlies	2020-12-19 18:26:29 +01:00
FUNDING.yml	Add: [GitHub] sponsor button on github.com (#7700)	2019-08-31 21:20:24 +02:00
ISSUE_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md	Fix: add missing variables to NewGRF inspect window.	2021-01-10 21:24:38 +01:00
stale.yml