Rocky Duan 04387289fa fixed bugs caused by merging

2012-08-14 13:43:04 -07:00

..

djangoapps

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

2012-08-14 12:54:43 -07:00

lib

fixed bugs caused by merging

2012-08-14 13:43:04 -07:00

static

Merge remote-tracking branch 'origin/master' into arjun/javascript_response

2012-08-13 10:13:21 -04:00

templates

Allow for modular css from XModules, and split capa module css out as a test

2012-07-24 16:14:04 -04:00

test

Make the simple course pass roundtrip test:

2012-08-07 11:06:47 -04:00