Tom Giannattasio 6a50da3d16 Merge branch 'master' into feature/tomg/fall-design

2012-08-13 10:26:28 -04:00

..

djangoapps

Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches

2012-08-13 06:55:05 -07:00

lib

Merge branch 'master' into feature/tomg/fall-design

2012-08-13 10:26:28 -04: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