Michael Schmatz 06f164525f Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/ladder/ladder_tab.coffee		2014-04-04 13:48:39 -07:00
..
config	Latest update, ready to release version 1.2 of the windows installer.	2014-04-04 10:14:48 +02:00
localisation	Added french and chinese as extra lanaguages for the installer.	2014-04-04 15:13:00 +02:00
scripts	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 13:48:39 -07:00
setup.bat	Moved all the scripts in a folder and made a root setup, to make it much cleaner and prevent confusion for the end-user	2014-03-24 03:55:40 +01:00