lms/djangoapps/django_comment_client · 5009b78150bbbb44b3d259a665c45f3fcc15f735 · edx / edx-platform

Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge · 5009b781

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py

committed Aug 14, 2012

5009b781

Name	Last commit	Last update
..
base		Loading commit data...
forum		Loading commit data...
management		Loading commit data...
migrations		Loading commit data...
__init__.py		Loading commit data...
middleware.py		Loading commit data...
models.py		Loading commit data...
permissions.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
utils.py		Loading commit data...