Ting-Kuan 692693c181 Merge branch 'master' into feature/loading-views ... Conflicts: app/locale/en.coffee app/views/editor/level/edit.coffee app/views/kinds/CocoView.coffee app/views/play/ladder/ladder_tab.coffee app/views/play/ladder_view.coffee app/views/play/level/level_loading_view.coffee		2014-04-19 01:15:04 -04:00
..
CocoView.coffee	Merge branch 'master' into feature/loading-views	2014-04-19 01:15:04 -04:00
ModalView.coffee	Fixed patches denormalization.	2014-04-17 15:44:19 -07:00
RootView.coffee	Fixed #786.	2014-04-12 12:35:45 -07:00
SearchView.coffee	Rebased master to get updated schemas and added patch schema	2014-04-12 15:16:42 +05:30