freeCodeCamp/seed
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
..
challenges Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
bonfireMDNlinks.js Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
challenge-migration.js change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
challengeMapping.json Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
field-guides.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
flattenUser.js save users into new user collection 2015-06-07 22:06:57 -07:00
future-jquery-ajax-json.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
index.js Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
jobs.json Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
nonprofits.json fix nonprofit ids should be unique 2015-06-04 14:32:16 -07:00
storyCleanup.js Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
userMigration.js change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00