Bridger Maxwell 68ab19730f Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading ...

Conflicts:
	lms/djangoapps/courseware/views.py

2012-09-20 17:42:31 -04:00

..

__init__.py

move instructor dashboard into its own lms djangoapp; add new

2012-09-02 19:05:34 -04:00

tests.py

cleaned up instructor dashboard CSV unit test code, per https://github.com/MITx/mitx/pull/615

2012-09-04 18:56:49 -04:00

views.py

Merge remote-tracking branch 'origin/master' into feature/bridger/course_grading

2012-09-20 17:42:31 -04:00