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

..

djangoapps

Merge branch 'release'

2014-06-10 16:59:23 -04:00

lib

Merge branch 'release'

2014-06-10 16:59:23 -04:00

static

Merge branch 'release'

2014-06-10 16:59:23 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

Update database caches to include latest migrations

2014-06-09 09:25:14 -04:00

.gitignore

…

xml_cleanup.py

…