Files
edx-platform/common/lib
Rocky Duan 8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
2012-08-20 15:31:51 -07:00
..
2012-08-02 11:33:04 -04:00