Michael Schmatz 3262ad81f2 Merge branch 'master' of github.com:codecombat/codecombat ... Conflicts: app/views/play/spectate_view.coffee		2014-03-13 15:24:04 -07:00
..
assets	Hooked up new HUD icons.	2014-03-04 11:15:31 -08:00
collections
lib	Probably too mean to tell users that their password is wrong three times, so just once will do.	2014-03-13 10:27:32 -07:00
locale	Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee.	2014-03-13 10:33:20 -07:00
models	Set up a build queue for async sprite sheet building, which lessens blocking the main thread.	2014-03-13 13:25:03 -07:00
styles	Merge branch 'master' of github.com:codecombat/codecombat	2014-03-13 15:24:04 -07:00
templates	Resolved some merge conflicts.	2014-03-13 10:32:18 -07:00
views	Merge branch 'master' of github.com:codecombat/codecombat	2014-03-13 15:24:04 -07:00
application.coffee	Better handling of refreshing ladder and matches views depending on idle state.	2014-03-12 11:39:09 -07:00
initialize.coffee
treema-ext.coffee	Merge pull request #513 from rubenvereecken/treema_fix	2014-03-12 09:21:52 -07:00