Files
edx-platform/common/djangoapps/student
Rocky Duan 0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
2012-08-06 22:38:31 -04:00
..
2012-07-23 14:44:40 -04:00
2012-07-23 14:44:40 -04:00
2012-08-04 17:59:44 -04:00
2012-07-13 11:51:32 -04:00