Commit 45b51c2e by Stephen Sanchez

Merge branch 'release'

Conflicts:
	apps/openassessment/assessment/peer_api.py
	apps/openassessment/assessment/test/test_peer.py
	apps/openassessment/xblock/test/test_peer.py
parents 8c0e01b1 418da06d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment