Scott Erickson e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader ... Conflicts: app/views/kinds/CocoView.coffee app/views/play/level/level_loading_view.coffee		2014-04-11 11:19:16 -07:00
..
CocoView.coffee	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
ModalView.coffee	Shifted nanoscroller to vendor.	2014-04-04 00:13:09 +05:30
RootView.coffee	Moved nanoscroller to bower components and related fixes.	2014-04-08 03:04:36 +05:30
SearchView.coffee	Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.	2014-04-05 17:05:03 -07:00