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
..
bug.yaml	Change: [GitHub] use an issue form to let people fill in bug report / crashes (#9400)	2021-06-26 13:51:29 +02:00
config.yml	Github: Enable blank issues, remove contact links section	2021-10-29 19:51:27 +01:00
crash.yaml	Change: [GitHub] use an issue form to let people fill in bug report / crashes (#9400)	2021-06-26 13:51:29 +02:00