Scott Erickson 97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch ... Conflicts: app/initialize.coffee bower.json		2014-04-11 10:32:19 -07:00
..
base_view.coffee	Tweak to view.	2014-04-09 16:09:53 -07:00
clas_view.coffee	More migrations	2014-03-24 22:28:34 +05:30
files_view.coffee	Changing the files view to replace files when there are name collisions.	2014-02-19 10:55:15 -08:00
level_sessions_view.coffee	Loading active candidate profiles from the database into a table for employers.	2014-04-06 17:01:56 -07:00
users_view.coffee	Extended the save version modal to allow submitting patches.	2014-04-10 13:09:44 -07:00