Michael Q Larson 2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements ... Conflicts: controllers/resources.js views/account/show.jade views/coursewares/showHTML.jade views/coursewares/showJS.jade views/partials/bonfires.jade		2015-03-21 16:36:35 -07:00
..
account	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00
bonfire	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00
challenges	add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces	2015-03-08 01:36:09 -08:00
contact	add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces	2015-03-08 01:36:09 -08:00
coursewares	Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements	2015-03-21 16:36:35 -07:00
partials	Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements	2015-03-21 16:36:35 -07:00
resources	Merge branch 'master' into ux-improvements	2015-03-21 16:25:39 -07:00
stories	improve upvoting UX and start adding angular validation to submit-story view	2015-03-18 00:40:18 -07:00
home.jade	Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp	2015-03-08 12:16:35 -07:00
layout-wide.jade	fix issue with chat page showing 304 in firefox	2015-03-07 01:37:41 -08:00
layout.jade	fix issue with chat page showing 304 in firefox	2015-03-07 01:37:41 -08:00