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

..

ci-build.yml

Merge branch 'master' into jgrpp

2021-02-01 17:07:34 +00:00

preview_build.yml

Add: [Actions] preview workflow, where PRs can be reviewed in the browser

2020-12-15 15:46:39 +01:00

preview_label.yml

Add: [Actions] preview workflow, where PRs can be reviewed in the browser

2020-12-15 15:46:39 +01:00

preview_push.yml

Add: [Actions] preview workflow, where PRs can be reviewed in the browser

2020-12-15 15:46:39 +01:00

release.yml

Codechange: [Actions] we no longer need xdg-basedir (#8615)

2021-01-29 10:38:58 +01:00