Michael Q Larson 5cc5623648 Merge branch 'master' into coderbye ...

Conflicts:
	seed_data/bonfires.json

2015-02-14 16:29:34 -08:00

..

bonfires.json

Merge branch 'master' into coderbye

2015-02-14 16:29:34 -08:00

challenge-hashes

Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more

2015-01-25 23:56:04 -05:00

challenges.json

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

2015-02-14 12:32:50 -08:00

coursewares.json

minor updates to coursewares.json

2015-02-14 15:50:47 -08:00

seed.js

start adding Courseware controllers, routes etc.

2015-02-01 14:22:34 -08:00