Quincy Larson fb3a116fff Merge branch 'master' into mobile-news ...

Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade

2015-04-30 19:10:10 -07:00

..

account

start styling news for mobile

2015-04-28 22:29:59 -07:00

bonfire

Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00

challengeMap

add videos to some challenges

2015-04-29 22:05:21 -07:00

coursewares

Merge branch 'master' into mobile-news

2015-04-30 19:10:10 -07:00

field-guide

fix some issues with @terakilobyte and beautify the camper news index view

2015-04-30 14:55:00 -07:00

nonprofits

fix some issues with @terakilobyte and beautify the camper news index view

2015-04-30 14:55:00 -07:00

partials

more camper news improvements

2015-04-30 15:56:14 -07:00

resources

Merge branch 'master' into mobile-news

2015-04-30 19:10:10 -07:00

stories

remove some whitespace

2015-04-30 19:03:55 -07:00

home.jade

Resolve merge conflicts using Webstorm's merge integration tool.

2015-04-17 00:11:13 -04:00

layout-wide.jade

make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse

2015-04-24 01:31:59 -07:00

layout.jade

make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse

2015-04-24 01:31:59 -07:00