apps/openassessment/xblock/openassessmentblock.py · b3249c01b52c5ecc8851168323c1792db666c2d0 · edx / edx-ora2 · GitLab

Blame History Permalink

Merge branch 'master' into sanchez/TIM-171-Submission-UI · b3249c01
```
Conflicts:
	apps/openassessment/xblock/submission_mixin.py
```
Stephen Sanchez committed Feb 25, 2014
b3249c01

openassessmentblock.py 14.5 KB