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
..
batch	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 13:48:39 -07:00
last_step_succesfull	Version 1.1 of the windows installer is online and active	2014-04-04 05:41:16 +02:00
recycle_bin	v 1.0 of the installer	2014-04-01 01:01:06 +02:00
src	Version 1.1 of the windows installer is online and active	2014-04-04 05:41:16 +02:00
.gitignore	Added a packer batch file to generate new version of the windows dev setup.	2014-02-04 02:20:24 +01:00
dev-setup-packer.bat	The setup package script works again.	2014-03-24 04:04:51 +01:00