Files
edx-platform/lms/djangoapps/instructor
Jean Manuel Nater 3c67e2754a Merge branch 'master' into jnater/courseware_tests
Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py
2013-06-27 13:53:47 -04:00
..
2013-06-26 15:28:36 -07:00