openassessment/xblock/static · 0dfc8fe6dd476c75919bd0007e319434d97db1c1 · edx / edx-ora2 · GitLab

History Find file

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/fix-option-deletion-wrapper · 0dfc8fe6
```
Conflicts:
	openassessment/xblock/static/css/openassessment.css
	openassessment/xblock/static/js/openassessment-lms.min.js
```
gradyward committed Jul 14, 2014
0dfc8fe6

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...