Ibrahim Awwal 939b927fbd Merge branch 'master' into feature/ibrahim/followed-threads ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py

2012-09-20 23:55:13 -07:00

..

__init__.py

moved django_comment_client into edx

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

urls.py

Change following=>followed.

2012-09-18 14:50:14 -07:00

views.py

Merge branch 'master' into feature/ibrahim/followed-threads

2012-09-20 23:55:13 -07:00