Quincy Larson 465835d6b1 Merge branch 'staging' into map-restructure ...

Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/intermediate-ziplines.json

2015-10-02 11:23:54 -07:00

..

advanced-bonfires.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

angularjs.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

automated-testing-and-debugging.json

restructure challenges and add certificate challenge skeletons

2015-10-01 23:54:20 -07:00

basejumps.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

basic-bonfires.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

basic-javascript.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

basic-ziplines.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

bootstrap.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

front-end-development-certificate.json

restructure challenges and add certificate challenge skeletons

2015-10-01 23:54:20 -07:00

full-stack-development-certificate.json

restructure challenges and add certificate challenge skeletons

2015-10-01 23:54:20 -07:00

getting-started.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

git.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

hikes.json

remove vestigial difficulty attribute from challenges

2015-10-02 01:06:27 -07:00

html5-and-css.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

intermediate-bonfires.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

intermediate-ziplines.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

jquery.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

json-apis-and-ajax.json

restructure challenges and add certificate challenge skeletons

2015-10-01 23:54:20 -07:00

mongodb.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

nodejs-and-expressjs.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

object-oriented-and-functional-programming.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00

upper-intermediate-bonfires.json

Merge branch 'staging' into map-restructure

2015-10-02 11:23:54 -07:00