Rocky Duan 700594263e Merge branch 'brittany' of github.com:dementrock/mitx into profile & ...

small fix

Conflicts:
	lms/templates/discussion/user_profile.html

2012-08-14 16:52:43 -07:00

..

__init__.py

moved django_comment_client into edx

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

urls.py

toggle moderator status

2012-08-14 16:43:33 -07:00

views.py

Merge branch 'brittany' of github.com:dementrock/mitx into profile &

2012-08-14 16:52:43 -07:00