Michael Q Larson 5c54fddaec Merge branch 'master' into timestamp ... Conflicts: views/partials/challenges.jade		2014-12-03 23:31:36 -08:00
..
about-us.jade	remove redundant chat box	2014-11-30 22:41:02 -08:00
challenges.jade	change duration of chatroom challenge	2014-11-29 16:19:44 -08:00
faq.jade	update landing copy	2014-11-30 23:25:02 -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	update meta info	2014-11-18 11:35:57 -08:00
navbar.jade	reached a stopping point, trying to fix a production bug	2014-11-26 22:00:28 -08:00