Quincy Larson e322b3b7d6 Merge branch 'master' into modals ... Conflicts: seed_data/field-guides.json views/coursewares/showHTML.jade		2015-05-28 17:25:34 -07:00
..
lib	Set a refresh on codemirror instance rather than setting the cursor position. Closes #640	2015-05-28 19:51:42 -04:00
.jshintrc	Work on bonfire and make better .jshintrc files	2015-01-16 18:58:27 -05:00
main_0.0.2.js	finish fixing modals	2015-05-28 16:18:04 -07:00