Ting-Kuan 0e08a4106b Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/localization/de.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat scripts/windows/coco-dev-setup/recycle_bin/git-test.bat		2014-04-12 16:52:14 -04:00
..
ladder	Fixed tutorial modal for nonexistent tutorials	2014-04-10 11:42:22 -07:00
level	Fixed #681 by removing full-screen button in Safari.	2014-04-11 18:19:52 -07:00
ladder_view.coffee	Pull from upsatream.	2014-04-04 12:52:22 -04:00
level_view.coffee	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-12 16:52:14 -04:00
spectate_view.coffee	Hacky way to get play background to fit with new loading image.	2014-04-11 16:15:26 -07:00