Calen Pennington cfd6890d68 Merge remote-tracking branch 'origin/master' into cpennington/cms-github ...

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

2012-07-10 08:50:54 -04:00

..

djangoapps

minor changes - test this branch with more courses (8.01x, 6.00x)

2012-07-08 22:05:21 -04:00

envs

Merge remote-tracking branch 'origin/master' into cpennington/cms-github

2012-07-10 08:50:54 -04:00

lib

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

static

Removed table borders and declared inputs as inline instead of inline-block

2012-07-05 10:01:02 -04:00

templates

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

urls.py

Remove dead code

2012-06-29 12:45:18 -04:00