Rocky Duan 028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-18 16:57:00 -07:00

17 KiB

Raw Blame History

View Raw