openassessment.min.js
31.8 KB
-
Merge branch 'master' of https://github.com/edx/edx-ora2 into will/grady/self-assessment-feedback · 49cad1fa
Conflicts: openassessment/xblock/static/js/openassessment.min.js
gradyward committed
Conflicts: openassessment/xblock/static/js/openassessment.min.js