2 Commits

Author SHA1 Message Date
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
Bridger Maxwell
9ce3b83be3 Added a simple course for testing the grading functions. 2012-09-20 13:29:16 -04:00