Arjun Singh 81bfdddccc Fix discussions in xmodules ...

Conflicts:

	lms/static/coffee/src/discussion/main.coffee

2012-09-02 15:14:54 -07:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Fix discussions in xmodules

2012-09-02 15:14:54 -07:00

setup.py

Merge branch 'master' of github.com:MITx/mitx into profile

2012-08-18 16:57:00 -07:00