Jonathan G Rennison e95216b59d Merge branch 'master' into jgrpp ... # Conflicts: # src/company_cmd.cpp # src/core/geometry_func.cpp # src/date.cpp # src/genworld_gui.cpp # src/gfx.cpp # src/object_gui.cpp # src/openttd.cpp # src/settings_type.h # src/video/allegro_v.cpp # src/video/dedicated_v.cpp # src/video/null_v.cpp # src/video/sdl2_v.cpp # src/video/sdl_v.cpp # src/video/win32_v.cpp		2021-02-19 15:38:34 +00:00
..
workflows	Merge branch 'master' into jgrpp	2021-02-19 15:38:34 +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	Add: [GitHub] Add issue template to encourage better issue reporting. (#7137)	2019-01-29 18:15:54 +01:00
PULL_REQUEST_TEMPLATE.md	Fix: add missing variables to NewGRF inspect window.	2021-01-10 21:24:38 +01:00
stale.yml	Add: [GitHub] enable probot/stale, to flush out stale issues/pull requests	2019-01-24 21:57:06 +01:00