JonahStanley 46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests ...

Conflicts:
	cms/envs/test.py

2013-06-17 16:43:56 -04:00

..

djangoapps

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-17 16:43:56 -04:00

lib

Make XModuleDescriptor use __init__ from XBlock

2013-06-17 13:38:57 -04:00

static

Merge branch 'master' into feature/christina/metadata-ui

2013-05-31 09:46:17 -04:00

templates

Record junit reports of jasmine tests

2013-05-22 22:01:44 -04:00

test

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-17 16:43:56 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00