problem_builder/public/js · 85d12cce1086b3af74cc179309fdfd69f24439f9 · OpenEdx / problem-builder

Merge remote-tracking branch 'remotes/origin/edx-release' into merge-candidate · 85d12cce

Conflicts:
	problem_builder/mentoring.py
	problem_builder/questionnaire.py
	problem_builder/tests/integration/test_dashboard.py
	problem_builder/tests/integration/xml/assessment_2.xml
	problem_builder/tests/integration/xml/mcq_with_html_choices.xml
	problem_builder/tests/integration/xml/mrq_with_comments_1.xml
	problem_builder/tests/integration/xml/mrq_with_html_choices.xml
	problem_builder/tests/integration/xml_templates/assessment.xml
	problem_builder/v1/tests/xml/v1_upgrade_a_new.xml
	problem_builder/v1/tests/xml/v1_upgrade_b_new.xml
	run_tests.py
	test_requirements.txt

committed May 12, 2015

85d12cce

Name	Last commit	Last update
..
vendor		Loading commit data...
answer.js		Loading commit data...
dashboard.js		Loading commit data...
mentoring-table.js		Loading commit data...
mentoring.js		Loading commit data...
mentoring_assessment_view.js		Loading commit data...
mentoring_edit.js		Loading commit data...
mentoring_standard_view.js		Loading commit data...
questionnaire.js		Loading commit data...