Jay Zoldak 32ed4e9973 Skip intermittently failing video test

2014-06-03 18:13:25 -04:00

..

djangoapps

Merge branch 'release'

2014-06-02 15:29:40 -04:00

lib

Merge pull request #3872 from edx/nick/disable-masking

2014-06-02 13:21:47 -07:00

static

Merge pull request #3942 from edx/adam/protocol

2014-06-03 14:09:20 -04:00

templates

Implement editing from the Studio container page.

2014-04-09 10:32:11 -04:00

test

Skip intermittently failing video test

2014-06-03 18:13:25 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…