Files
edx-platform/lms/lib/comment_client/comment_client.py
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

1.7 KiB