Scott Erickson 2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch ... Conflicts: app/initialize.coffee bower.json		2014-04-11 10:33:22 -07:00
..
User.coffee	Merged	2014-03-16 10:06:47 -07:00
user_handler.coffee	Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch	2014-04-11 10:33:22 -07:00
user_schema.coffee	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00