Files
edx-platform/common/lib/xmodule/setup.py
Vik Paruchuri bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00

2.3 KiB