Peter Fogg 8c5f9e6e41 Fix merge conflict.

2013-06-03 08:49:52 -04:00

..

djangoapps

Merge pull request #11 from edx/feature/christina/metadata-ui

2013-06-01 16:01:53 -07:00

lib

Fix merge conflict.

2013-06-03 08:49:52 -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 pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes

2013-05-24 06:26:23 -07: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