Sarina Canelake
2aea261d48
Merge branch 'release'
Conflicts:
common/djangoapps/course_modes/views.py
common/djangoapps/student/tests/test_roles.py
common/djangoapps/student/views.py
common/lib/opaque_keys/opaque_keys/__init__.py
common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
common/lib/xmodule/xmodule/contentstore/mongo.py
lms/djangoapps/certificates/management/commands/gen_cert_report.py
lms/djangoapps/notes/views.py
2014-06-10 16:59:23 -04:00
..
2012-12-28 11:29:29 -05:00
2014-05-08 12:09:23 -04:00
2014-05-29 17:03:35 -04:00
2013-06-19 16:56:34 -04:00
2014-05-29 17:03:35 -04:00
2014-05-08 12:09:23 -04:00
2014-06-10 16:59:23 -04:00