Commit 97a73124 by Will Daly

Merge remote-tracking branch 'origin/master' into authoring

Conflicts:
	openassessment/xblock/static/css/openassessment.css
parents 2b17d244 265c580c
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