ChrisAdderley 2bb4e594dc Merge branch 'develop' ... # Conflicts: # Distribution/Restock/GameData/ReStock/Restock.restockblacklist # Distribution/Restock/changelog.txt # Distribution/Restock/readme.txt # Distribution/RestockPlus/changelog.txt # Distribution/RestockPlus/readme.txt		2019-10-19 23:06:08 -07:00
..
de-de.cfg	Merge branch 'comms'	2019-02-22 15:10:04 -08:00
en-us.cfg	Merge branch '1-8-updates' into develop	2019-10-19 15:54:09 -07:00
es-es.cfg	add Restock+ es-es localization provided by Niako	2019-07-04 11:25:28 -07:00
pt-br.cfg	Add Brazilian Portuguese localization	2019-05-23 20:29:35 -03:00