Merge branch 'master' of https://github.com/edx/edx-ora2 into will/grady/self-assessment-feedback
Conflicts: openassessment/xblock/static/js/openassessment.min.js
Showing
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
Please
register
or
sign in
to comment