views.py
51.4 KB
-
Merge branch 'dcadams/cme_registration' into edx-west/rc-20130912 · 2eb82fb9
Conflicts: common/djangoapps/student/views.py lms/envs/common.py
Jason Bau committed
Conflicts: common/djangoapps/student/views.py lms/envs/common.py