Calen Pennington 171e932266 Merge branch 'master' into feature/cale/cms-master ...

Conflicts:
	rakefile

2012-11-08 12:28:40 -05:00

..

capa

Merge branch 'master' into feature/cale/cms-master

2012-11-08 12:28:40 -05:00

xmodule

Merge branch 'master' into feature/cale/cms-master

2012-11-08 12:28:40 -05:00

logsettings.py

Move logsettings to common, so that it's shared between cms and lms

2012-10-11 12:31:52 -04: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

add a handy supertrace script

2012-08-02 11:33:04 -04:00