Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements ...

Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade

2015-05-22 19:36:15 -07:00

..

challenge.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

challengeMap.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

constantStrings.json

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

fieldGuide.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

home.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

nonprofits.js

Fix Lint all the controllers

2015-05-21 11:07:40 -07:00

resources.js

Merge branch 'staging' into nonprofit-improvements

2015-05-22 19:36:15 -07:00

resources.json

remove references to meeting from announcements and notification modal

2015-03-28 10:14:49 -07:00

story.js

Merge branch 'staging' into nonprofit-improvements

2015-05-22 19:36:15 -07:00

user.js

Fixes email signin from field-guide. Closes #429

2015-05-22 08:59:25 -04:00