Rocky Duan 2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/urls.py

2012-08-07 16:58:14 -04:00

..

djangoapps

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

2012-08-07 16:58:14 -04:00

lib

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

2012-08-07 16:58:14 -04:00

static

moved some stuff & ajax link to page

2012-08-03 15:55: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