Quincy Larson 1bb9951d04 Merge branch 'master' into staging ...

Conflicts:
	seed/challenges/basic-bonfires.json

2015-06-19 17:39:11 -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 'master' into staging

2015-06-19 17:39:11 -07:00

basic-html5-and-css.json

Merge pull request #938 from LumenTeun/lumenteun-914

2015-06-19 16:05:23 -07:00

basic-javascript.json

add dashedName attributes to JSON

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

bootstrap.json

Check fix in 'Bootstrap Grid'. #907

2015-06-15 18:26:44 +02: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

Merge pull request #937 from LumenTeun/lumenteun-918

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