Quincy Larson 0fdf9fbe62 Merge branch 'staging' into jquery ... Conflicts: seed/challenges/bootstrap.json seed/challenges/jquery.json		2015-08-12 02:06:03 -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-12 02:06:03 -07:00
basic-ziplines.json	make @nickbarry's recommended get-set-for-ziplines copy fixes'	2015-08-12 01:32:16 -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	Merge pull request #1655 from ahstro/ahstro-1647	2015-08-12 01:13:14 -07:00
intermediate-ziplines.json	fix omission in simon zipline	2015-08-11 23:53:30 -07:00
jquery.json	fix issue discovered by @reddraft	2015-08-12 02:00:24 -07:00
json-apis-and-ajax.json	get everything seeding again	2015-08-10 22:17:49 -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	fix mising type	2015-08-10 11:27:12 -07:00