Vik Paruchuri a0febd35a0 Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-02-06 13:22:12 -05:00

..

capa

Pep8 autofixes

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

xmodule

Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images

2013-02-06 13:22:12 -05:00

.gitignore

Starting to generate jasmine tests for common/lib

2012-11-14 15:03:55 -05:00

logsettings.py

Defaulting service_variant to a blank string

2013-02-04 12:05:45 -05:00

rooted_paths.py

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -04:00

supertrace.py

Pep8 autofixes

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