Quincy Larson e322b3b7d6 Merge branch 'master' into modals ...

Conflicts:
	seed_data/field-guides.json
	views/coursewares/showHTML.jade

2015-05-28 17:25:34 -07:00

..

getstuff.jade

Users can now jump around and continue a linear progression through challenges. Added getstuff for easy debugging

2015-05-20 00:38:25 -04:00

showBonfire.jade

fix if else syntax in Jade and add cities

2015-05-28 16:59:25 -07:00

showHTML.jade

Merge branch 'master' into modals

2015-05-28 17:25:34 -07:00

showJS.jade

fix if else syntax in Jade and add cities

2015-05-28 16:59:25 -07:00

showVideo.jade

finish fixing modals

2015-05-28 16:18:04 -07:00

showZiplineOrBasejump.jade

fix if else syntax in Jade and add cities

2015-05-28 16:59:25 -07:00