common/lib/xmodule/xmodule/course_module.py · 0936f448fc97acfdc1e73b30e942e26c86c37c3d · edx / edx-platform · GitLab

Blame History Permalink

Merge remote-tracking branch 'origin/master' into feature/victor/cohorts · 6847779f
```
Conflicts:
	common/djangoapps/student/models.py
```
Victor Shnayder committed Jan 26, 2013
6847779f

course_module.py 27.2 KB