4 Commits

Author	SHA1	Message	Date
Quincy Larson	5fb89cb091	Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-11 11:16:31 -07:00
Quincy Larson	61486c2d7c	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ... Conflicts: app.js controllers/fieldGuide.js controllers/story.js seed/challenges/basic-html5-and-css.json seed/challenges/bootstrap.json seed/field-guides.json server/views/partials/navbar.jade views/resources/jobs-form.jade views/resources/nonprofits-form.jade views/resources/pmi-acp-agile-project-managers-form.jade	2015-06-09 13:48:29 -07:00
Quincy Larson	3654bb7e6f	change _id to id everywhere that seems relevant to loopback	2015-06-04 13:20:42 -07:00
Berkeley Martinez	272d9b4ad5	Update seed directory to use loopback	2015-06-02 20:32:10 -07:00