Quincy Larson f2356c6767 Merge branch 'staging' into jquery ...

Conflicts:
	seed/challenges/bootstrap.json

2015-08-10 22:03:51 -07:00

..

advanced-bonfires.json

fix mising type

2015-08-10 11:27:12 -07:00

angularjs.json

add type to challenges

2015-08-07 23:37:32 -07:00

automated-testing-and-debugging.json

rename top level title to name

2015-08-07 18:43:45 -07:00

basejumps.json

add type to challenges

2015-08-07 23:37:32 -07:00

basic-bonfires.json

Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511

2015-08-10 20:40:39 -07:00

basic-javascript.json

Merge branch 'staging' into jquery

2015-08-10 22:03:51 -07:00

basic-ziplines.json

add type to challenges

2015-08-07 23:37:32 -07:00

bootstrap.json

Merge branch 'staging' into jquery

2015-08-10 22:03:51 -07:00

git.json

add type to challenges

2015-08-07 23:37:32 -07:00

hikes.json

add type to challenges

2015-08-07 23:37:32 -07:00

html5-and-css.json

Merge branch 'staging' into jquery

2015-08-10 22:03:51 -07:00

intermediate-bonfires.json

fix missing quote escape

2015-08-10 17:35:16 -07:00

intermediate-ziplines.json

add type to challenges

2015-08-07 23:37:32 -07:00

jquery-ajax-and-json.json

Merge branch 'staging' into jquery

2015-08-10 22:03:51 -07:00

json-apis-and-ajax.json

add type to challenges

2015-08-07 23:37:32 -07:00

mongodb.json

add type to challenges

2015-08-07 23:37:32 -07:00

nodejs-and-expressjs.json

add type to challenges

2015-08-07 23:37:32 -07:00

object-oriented-and-functional-programming.json

update curriculum structure again

2015-08-09 21:26:26 -07:00

upper-intermediate-bonfires.json

fix mising type

2015-08-10 11:27:12 -07:00