Quincy Larson d5b5973326 Merge branch 'interview' into staging ...

Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json

2015-06-14 01:02:39 -07:00

..

advanced-bonfires.json

first challenge json file updated with dashedname

2015-06-13 23:50:36 -07:00

basejumps.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

basic-bonfires.json

Merge branch 'interview' into staging

2015-06-14 01:02:39 -07:00

basic-html5-and-css.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

basic-javascript.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

bootstrap.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

computer-science.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

full-stack-javascript.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

functional-programming.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

get-set-for-free-code-camp.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

intermediate-bonfires.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

jquery-ajax-and-json.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

object-oriented-javascript.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00

ziplines.json

add dashedName attributes to JSON

2015-06-14 00:55:27 -07:00