Jonathan G Rennison 8eb27e1ac7 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h

2021-04-25 22:14:59 +01:00

..

ISSUE_TEMPLATE

Change: [Actions] Reword bug/crash report instructions (#9104)

2021-04-25 19:27:30 +01:00

workflows

Github: Disable CI build workflow on push to master

2021-04-11 03:16:06 +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