Commit Graph

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
Vik Paruchuri
b209018c46 Adding tests 2012-11-06 09:03:59 -05:00