Michael Q Larson 4d3337df32 Merge branch 'ziplines' into ux-improvements ...

Conflicts:
	views/coursewares/showJS.jade

2015-03-28 00:24:41 -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

get hotkey working in showVideo

2015-03-22 01:28:40 -07:00