Jay Zoldak f00b42c950 Merge pull request #88 from edx/zoldak/revert-search-push ...

Revert accidental push of changes to master

2013-06-06 07:26:49 -07:00

..

djangoapps

Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search"

2013-06-06 10:06:37 -04:00

lib

video module: remove old methods

2013-06-06 16:46:47 +03: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