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

..

lib

resolve merge conflicts

2015-03-21 12:03:16 +09:00

themes

update the hackathon starter base app

2014-11-29 21:32:59 -08:00

main.css

add jobs page

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

main.less

removed "white-space: pre-line" rule from pre.wrappable elements to prettify bonfire solution formatting.

2015-05-19 18:00:25 -07:00