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

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

2015-08-13 13:25:53 -07:00

..

advanced-bonfires.json

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00

angularjs.json

fix angular.js typo

2015-08-12 20:05:06 -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

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00

basic-javascript.json

Merge branch 'staging' into jquery

2015-08-12 02:06:03 -07:00

basic-ziplines.json

Merge branch 'staging' into jquery

2015-08-13 13:25:53 -07:00

bootstrap.json

Merge branch 'staging' into jquery

2015-08-12 02:06:03 -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-12 02:06:03 -07:00

intermediate-bonfires.json

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00

intermediate-ziplines.json

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00

jquery.json

remove inaccurate copy from jQuery challenge

2015-08-13 00:57:36 -07:00

json-apis-and-ajax.json

start adding json challenges

2015-08-13 12:55:50 -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

get everything seeding again

2015-08-10 22:17:49 -07:00

upper-intermediate-bonfires.json

replace RSAP with read-search-ask and replace AWS gifs with Imgur

2015-08-13 00:56:05 -07:00