Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04:00

..

__init__.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

comment_client.py

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

comment.py

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

commentable.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

legacy.py

Pep8 autofixes

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

models.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04: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

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

user.py

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

utils.py

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

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