codecombat/app/views/play
Ting-Kuan 508b570fea Merge branch 'master' into feature/loading-views
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
2014-04-12 17:07:30 -04:00
..
ladder Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07:00
level Merge branch 'master' into feature/loading-views 2014-04-12 17:07:30 -04:00
ladder_view.coffee Pull from upsatream. 2014-04-04 12:52:22 -04:00
level_view.coffee Merge branch 'master' into feature/loading-views 2014-04-12 17:07:30 -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