Nimisha Asthagiri d7f850a764 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/features/data_download.py

2014-10-07 16:23:28 -04:00

..

__init__.py

Improve forum error handling

2013-10-28 11:23:06 -04:00

comment_client.py

Quality cleanup

2014-09-08 12:02:31 -04:00

comment.py

Add endorsement info to marked answers in forum

2014-08-29 15:59:31 -04:00

commentable.py

Quality cleanup

2014-09-08 12:02:31 -04:00

models.py

Add endorsement info to marked answers in forum

2014-08-29 15:59:31 -04:00

requirements.txt

replaced comment client sym link

2012-08-12 22:55:55 -07:00

settings.py

Clean up usage of CS API key

2014-02-12 15:24:30 -05:00

thread.py

Merge branch 'release'

2014-10-07 16:23:28 -04:00

user.py

bugfix: avoid side-effects when overriding User.default_retrieve_params

2014-06-16 16:01:13 -04:00

utils.py

Four Unicode fixes in discussion

2014-10-02 10:56:55 +03:00