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

..

account

fix if else syntax in Jade and add cities

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

challengeMap

remove slashes from BR tags and correct Spanish sentence

2015-05-28 10:07:03 -07:00

coursewares

Merge branch 'master' into modals

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

field-guide

improve field guide look and add cracking code interview article

2015-05-25 00:42:32 -07:00

jobs

add jobs

2015-05-28 16:40:22 -07:00

nonprofits

add jobs

2015-05-28 16:40:22 -07:00

partials

fix if else syntax in Jade and add cities

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

resources

add jobs

2015-05-28 16:40:22 -07:00

stories

make a ton of small improvements related to github issues

2015-05-23 16:48:55 -07:00

home.jade

update videos

2015-05-28 17:22:45 -07:00

layout-wide.jade

finish moving away from connectAssets

2015-05-03 16:45:34 -07:00

layout.jade

finish moving away from connectAssets

2015-05-03 16:45:34 -07:00