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

..

jobs-form.jade

add jobs page

2015-05-22 19:30:56 -07:00

jobs.jade

add jobs page

2015-05-22 19:30:56 -07:00

nonprofits-form.jade

make new landing pages and forms for project managers and nonprofits

2015-04-27 16:17:29 -07:00

nonprofits.jade

replace landing youtube videos with superior vimeo video

2015-04-28 12:11:49 -07:00

pmi-acp-agile-project-managers-form.jade

make new landing pages and forms for project managers and nonprofits

2015-04-27 16:17:29 -07:00

pmi-acp-agile-project-managers.jade

Merge branch 'master' into mobile-news

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

sitemap.jade

Factor out more mentions of courseware and bonfire. Remove extraneous methos from resources.js. Refactor sitemap to use new structure.

2015-05-20 22:45:19 -04:00

test.css

add jobs page

2015-05-22 19:30:56 -07:00

twitch.jade

add campwide meeting and fix user show points

2015-05-05 09:22:38 -07:00

unsubscribed.jade

add unsubscribe path

2015-04-30 23:41:40 -07:00