Merge branch 'authoring' of https://github.com/edx/edx-ora2 into…
Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates Conflicts: openassessment/xblock/static/css/openassessment.css
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