common/templates · v0.1 · edx / edx-platform

Merge branch 'master' into select · 6d62e6f5

Conflicts:
	common/djangoapps/student/views.py
	common/lib/xmodule/xmodule/graders.py
	lms/templates/dashboard.html
	lms/templates/footer.html
	requirements/edx/base.txt

committed Sep 13, 2013

6d62e6f5

Name	Last commit	Last update
..
course_modes		Loading commit data...
jasmine		Loading commit data...
courseware_vendor_js.html		Loading commit data...
hinter_display.html		Loading commit data...
mathjax_include.html		Loading commit data...
xmodule_display.html		Loading commit data...
xmodule_edit.html		Loading commit data...