openassessmentblock.py
19.9 KB
-
Merge branch 'master' into sanchez/template-first-crack · d9fcf7e7
Conflicts: apps/openassessment/xblock/openassessmentblock.py
Stephen Sanchez committed
Conflicts: apps/openassessment/xblock/openassessmentblock.py