openassessment/xblock/static · 218d75131491ebd7a26c3b81c26d6099e375cd69 · edx / edx-ora2 · GitLab

History Find file

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/assessment-reorder · 218d7513
```
Conflicts:
	openassessment/xblock/static/js/openassessment-lms.min.js
	openassessment/xblock/static/js/openassessment-studio.min.js
```
gradyward committed Jul 11, 2014
218d7513

Name	Last commit	Last update
..
css		Loading commit data...
fonts/libs/font-awesome		Loading commit data...
js		Loading commit data...
sass		Loading commit data...
xml		Loading commit data...