Ting-Kuan 3e5762d359 Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/level_view.coffee		2014-04-15 13:33:24 -04:00
..
localized	Resolved merge conflicts of Jasper's translations	2014-04-15 02:04:52 +02:00
config.coco	Moved language selection to the top and starting localized the hardcoded stuff.	2014-04-12 16:55:59 +02:00
downloads.coco	Seperated win7 and win8 to prevent any future awkwardness	2014-04-12 21:15:36 +02:00
finished_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
github_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
header.coco	new variable system implemented and refactored a lot of files already.	2014-03-21 03:26:26 +01:00
install_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00
npm_and_brunch_header.coco	Pull from upsatream.	2014-04-04 12:52:22 -04:00