Quincy Larson 43f347bae0 Merge branch 'calculator' into staging ... Conflicts: app.js controllers/resources.js seed/field-guides.json		2015-06-14 01:10:48 -07:00
..
comments.jade	change _id to id everywhere that seems relevant to loopback	2015-06-04 13:20:42 -07:00
hot-stories.jade	Update links for new api model in views for stories.	2015-06-05 14:58:42 -04:00
index.jade	change _id to id everywhere that seems relevant to loopback	2015-06-04 13:20:42 -07:00
new-stories.jade	Begin shaping codebase for loopback migration.	2015-06-01 18:30:43 -04:00
news-nav.jade	Merge branch 'calculator' into staging	2015-06-14 01:10:48 -07:00
preliminary-submit.jade	Begin shaping codebase for loopback migration.	2015-06-01 18:30:43 -04:00
search-stories.jade	Begin shaping codebase for loopback migration.	2015-06-01 18:30:43 -04:00
show.jade	Begin shaping codebase for loopback migration.	2015-06-01 18:30:43 -04:00
submit-story.jade	Begin shaping codebase for loopback migration.	2015-06-01 18:30:43 -04:00