Scott Erickson fae9034dfc Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master ... Conflicts: app/models/SuperModel.coffee		2014-03-26 14:29:16 -07:00
..
profile_view.coffee	Migrate .on, .once - Batch 1	2014-03-24 12:23:41 +05:30
settings_view.coffee	More migrations	2014-03-24 22:28:34 +05:30
unsubscribe_view.coffee	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
wizard_settings_view.coffee	Migrate from .on, .once to .listenTo, .listenToOnce	2014-03-26 03:25:11 +05:30