views.py
54.1 KB
-
Merge commit 'c7546271' into edx-west/rc-20130918 · 9de80043
Conflicts: CHANGELOG.rst common/djangoapps/track/views.py common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
Jason Bau committed
Conflicts: CHANGELOG.rst common/djangoapps/track/views.py common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee