lms/djangoapps/courseware · 1a57ac50f43f5531f47035aad07c314d77af9b25 · edx / edx-platform

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html

committed Jul 25, 2012

52c71364

Name	Last commit	Last update
..
management		Loading commit data...
migrations		Loading commit data...
__init__.py		Loading commit data...
admin.py		Loading commit data...
course_settings.py		Loading commit data...
courses.py		Loading commit data...
grades.py		Loading commit data...
models.py		Loading commit data...
module_render.py		Loading commit data...
progress.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...