Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

__init__.py

replaced comment client sym link

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

comment_client.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

comment.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

commentable.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

legacy.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

models.py

Use 'is None' and 'is not None'

2013-03-04 10:57:25 -05:00

requirements.txt

replaced comment client sym link

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

settings.py

read the comment service shared key from django config

2012-08-23 08:02:19 -04:00

thread.py

update coffeescript

2013-03-13 12:52:07 -04:00

user.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

utils.py

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00