Commit graph

4 commits

Author SHA1 Message Date
Ting-Kuan
d7fabd7133 Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
	scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco
2014-04-06 13:43:59 -04:00
1c7
0911556c39 Chinese translate for windows automatic tool 2014-04-05 14:10:47 +08:00
Ting-Kuan
fe27756b06 Pull from upsatream. 2014-04-04 12:52:22 -04:00
Glen De Cauwsemaecker
4599725040 Added french and chinese as extra lanaguages for the installer. 2014-04-04 15:13:00 +02:00