karma.conf.js
2.1 KB
-
Merge remote-tracking branch 'origin/master' into authoring · 4f555761
Conflicts: openassessment/xblock/static/js/openassessment.min.js scripts/install-js.sh
Will Daly committed
Conflicts: openassessment/xblock/static/js/openassessment.min.js scripts/install-js.sh