cahrens 52b5da3e61 Merge branch 'talbs/studio-authorship' of github.com:edx/edx-platform into talbs/studio-authorship ...

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/templates/index.html

2013-07-11 12:41:22 -04:00

..

auth

pep8 cleanup

2013-07-09 11:08:27 -04:00

contentstore

Only send a single variable to index.html about authorship rights.

2013-07-11 12:39:51 -04:00

course_creators

Fix unicode return value.

2013-07-10 17:26:55 -04:00

models

pylint fixes

2013-07-09 19:16:44 -04:00