Quincy Larson 7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp ...

Conflicts:
	app.js
	views/challengeMap/show.jade

2015-05-01 23:12:56 -07:00

..

bonfireMDNlinks.js

make some improvements to the field guide articles and move the bonfire styleguide into field guides

2015-04-24 21:30:22 -07:00

bonfires.json

Closes #333

2015-04-24 16:04:25 -04:00

challenge-migration.js

start work on challenge-migraiton

2015-04-08 18:03:06 -07:00

challengeMapping.json

start work on challenge-migraiton

2015-04-08 18:03:06 -07:00

coursewares.json

fix spelling of pinterest

2015-04-30 08:53:48 -07:00

field-guides.json

Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp

2015-05-01 23:12:56 -07:00

future-coursewares.json

archive future coursewares in seed_data file

2015-04-21 19:45:57 -07:00

nonprofits.json

fix challenge map to redirect to nonprofits

2015-04-14 20:20:38 -07:00

seed.js

start process of moving wiki over to field guide

2015-04-08 17:18:51 -07:00

storyCleanup.js

more camper news improvements

2015-04-30 15:56:14 -07:00

userMigration.js

Update user migration script to ensure user model validity.

2015-04-15 00:53:36 -04:00