Quincy Larson 50c404d9be Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp

2015-04-20 22:34:53 -07:00

..

bonfireMDNlinks.js

Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00

bonfires.json

merge pr for unique story slugs

2015-04-20 00:28:55 -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

challenges.json

update camper news and chat challenges to have new videos and updated copy

2015-04-09 12:58:30 -07:00

coursewares.json

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

2015-04-20 22:34:53 -07:00

field-guides.json

make some improvements to our field guides

2015-04-20 18:51:24 -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

userMigration.js

Update user migration script to ensure user model validity.

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