Quincy Larson 9442f5f648 Merge branch 'master' into staging ...

Conflicts:
	controllers/resources.js
	public/js/main_0.0.2.js
	seed/challenges/advanced-bonfires.json
	seed/challenges/basic-bonfires.json
	seed/challenges/get-set-for-free-code-camp.json
	server/views/partials/navbar.jade

2015-06-24 07:19:54 -07:00

..

advanced-bonfires.json

Change eqls to equal

2015-06-21 00:56:20 -05:00

basejumps.json

add dashedName attributes to JSON

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

basic-bonfires.json

Fixes #1053

2015-06-22 10:30:26 -04:00

basic-html5-and-css.json

finishing touches on calculator

2015-06-19 21:24:04 -07:00

basic-javascript.json

add dashedName attributes to JSON

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

bootstrap.json

fix a bunch of github issues regarding waypoints

2015-06-19 18:31:21 -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

Merge branch 'master' into staging

2015-06-24 07:19:54 -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