Ting-Kuan 508b570fea Merge branch 'master' into feature/loading-views ... Conflicts: .gitignore app/locale/en.coffee app/models/SuperModel.coffee app/views/editor/thang/edit.coffee app/views/kinds/CocoView.coffee		2014-04-12 17:07:30 -04:00
..
CocoView.coffee	Merge branch 'master' into feature/loading-views	2014-04-12 17:07:30 -04:00
ModalView.coffee	Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.	2014-04-10 11:13:33 -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