Michael Q Larson c7a5a51c8d Merge branch 'timestamp' into challenges ...

Conflicts:
	config/passport.js
	public/css/main.less

2014-12-13 21:09:11 -08:00

..

about-us.jade

update landing page to remove gitter

2014-12-12 09:40:57 -08:00

challenges.jade

made parallel 'points' infrastructure

2014-12-05 20:44:42 -08:00

faq.jade

Merge branch 'timestamp' into challenges

2014-12-13 21:09:11 -08:00

flash.jade

updated alert messages close icon

2014-07-02 00:43:20 -04:00

footer.jade

update views and remove additional cruft

2014-11-01 18:07:59 -07:00

meta.jade

code to verify our website for pintrest

2014-12-11 12:06:00 -08:00

navbar.jade

Merge branch 'timestamp' into challenges

2014-12-13 21:09:11 -08:00