Julian Arni 91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:00:26 -04:00

..

test_files

Add TabsEditingDescriptor for VideoAlpha

2013-08-05 13:38:32 +03:00

xmodule

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:00:26 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

Changed back handling of Video by original Video code.

2013-08-09 09:22:57 +03:00