Quincy Larson b8b5f3471f Merge branch 'master' into staging ...

Conflicts:
	seed_data/challenges/basic-html5-and-css.json

2015-06-01 17:40:09 -07:00

..

challenges

Merge branch 'master' into staging

2015-06-01 17:40:09 -07:00

bonfireMDNlinks.js

update bonfires and mdn links

2015-05-21 18:59:55 -07: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

field-guides.json

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

2015-06-01 16:17:19 -07:00

future-jquery-ajax-json.json

finish html, css and bootstrap challenges

2015-05-25 22:46:47 -07:00

jobs.json

add jobs

2015-05-28 16:40:22 -07:00

nonprofits.json

add jobs page

2015-05-22 19:30:56 -07:00

seed.js

add jobs

2015-05-28 16:40:22 -07:00

storyCleanup.js

Update story cleanup script

2015-05-31 18:44:43 -04:00

userMigration.js

Create user update script to run against db to normalize zipline and basejumps for display

2015-05-26 11:49:09 -04:00