apps/openassessment/xblock · b491ad87fc3f79f4c498f53f8dd05fcfbf3e2024 · edx / edx-ora2

Merge branch 'master' into sanchez/template-first-crack · 6ac00039

Conflicts:
	apps/openassessment/peer/api.py
	apps/openassessment/xblock/openassessmentblock.py
	apps/openassessment/xblock/static/html/oa_rubric.html
	apps/openassessment/xblock/static/js/src/oa_submission.js

committed Feb 24, 2014

6ac00039

Name	Last commit	Last update
..
static		Loading commit data...
test		Loading commit data...
__init__.py		Loading commit data...
openassessmentblock.py		Loading commit data...
peer_assessment_mixin.py		Loading commit data...
scenario_parser.py		Loading commit data...
self_assessment_mixin.py		Loading commit data...
submission_mixin.py		Loading commit data...
ui_models.py		Loading commit data...