Rocky Duan eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-14 12:54:43 -07:00

15 KiB

Raw Blame History

View Raw