Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp

2021-11-01 18:54:43 +00:00

..

ISSUE_TEMPLATE

Merge branch 'master' into jgrpp-beta

2021-11-01 18:54:43 +00:00

workflows

Merge branch 'master' into jgrpp-beta

2021-10-28 23:51:24 +01: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

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