scripts · e4b445b53bebb01e35660f15f88102c8cdca505d · edx / edx-ora2

Merge branch 'master' into ai-grading · ac4251dd

Conflicts:
	apps/openassessment/xblock/static/js/fixtures/templates.json
	apps/openassessment/xblock/static/js/openassessment.min.js
	apps/openassessment/xblock/static/js/spec/oa_staff_info.js

committed May 23, 2014

ac4251dd

Name	Last commit	Last update
..
data		Loading commit data...
celery-worker.sh		Loading commit data...
install-js.sh		Loading commit data...
install-python.sh		Loading commit data...
install-test-course.sh		Loading commit data...
install.sh		Loading commit data...
js-debugger.sh		Loading commit data...
release.sh		Loading commit data...
render_templates.py		Loading commit data...
sandbox-commit.sh		Loading commit data...
sass.sh		Loading commit data...
test-js.sh		Loading commit data...
test-python.sh		Loading commit data...
test.sh		Loading commit data...
workbench.sh		Loading commit data...