Chris Dodge fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py

2013-05-20 10:22:36 -04:00

..

__init__.py

moved django_comment_client into edx

2012-07-23 16:20:45 -04:00

tests.py

Pep8 fixes of django_comment_client code

2013-05-16 15:57:34 -04:00

urls.py

Revert "Revert "fix merge conflict""

2013-05-16 10:29:33 -04:00

views.py

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-20 10:22:36 -04:00