Merge remote-tracking branch 'khopa/master' into develop_2_3_x

Browse Source

# Conflicts:
#	changelog.md
#	game/version.py
#	gen/ground_forces/ai_ground_planner.py
#	pydcs
#	resources/factions/iraq_1991.json
#	resources/factions/russia_2010.json

...

This commit is contained in:

Khopa 2020-12-24 13:32:14 +01:00

parent 368bf08ade 3260260dce

commit 38ce842ca8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available