greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
freeCodeCamp/seed/challenges
History
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
..
advanced-bonfires.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
basejumps.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
basic-bonfires.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
basic-html5-and-css.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
basic-javascript.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
bootstrap.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
computer-science.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
full-stack-javascript.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
functional-programming.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
get-set-for-free-code-camp.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
intermediate-bonfires.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00
jquery-ajax-and-json.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
object-oriented-javascript.json change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
ziplines.json Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-09 13:48:29 -07:00