David Ormsbee d0bff1ed3c Merge branch 'master' into jmpm-analytics ...

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

2013-03-06 17:09:09 -05:00

..

capa

Removed console.logs

2013-03-01 14:57:38 -05:00

course_groups

Prevent scroll-to-top on clicks in cohorts views

2013-02-24 19:44:41 -05:00

vendor

Merge branch 'master' into jmpm-analytics

2013-03-06 17:09:09 -05:00

pdfviewer.js

fix loading of specific pages.

2013-02-26 01:03:01 -05:00