Quincy Larson 0e9ab5017b Merge branch 'Lemony-Andrew-master' into staging ...

Conflicts:
	server/views/coursewares/showBonfire.jade

2015-06-19 16:17:59 -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 'Lemony-Andrew-master' into staging

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

basic-html5-and-css.json

fix minor typo in html challenge

2015-06-16 18:00:17 -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

Fix wikipedia viewer zipline naming

2015-06-16 08:36:54 -04:00