Michael Q Larson 43810ccb0c Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements ...

Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade

2015-03-29 14:44:49 -07:00

..

lib

Merge branch 'ziplines' into ux-improvements

2015-03-28 00:24:41 -07:00

.jshintrc

Work on bonfire and make better .jshintrc files

2015-01-16 18:58:27 -05:00

application.js

add the routes, controller actions and views for the nonprofit wizard

2015-03-24 21:46:42 -07:00

main.js

Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements

2015-03-29 14:44:49 -07:00