Jay Zoldak ed5ad46192 Revert "Revert "fix merge conflict"" ...

This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee

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

..

__init__.py

moved django_comment_client into edx

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

urls.py

Revert "Revert "fix merge conflict""

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

views.py

Revert "Revert "fix merge conflict""

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