Carlos Andrés Rocha 7d618f26ca Merge branch 'release' ...

Conflicts:
	lms/djangoapps/courseware/features/video.feature

2014-03-29 20:37:49 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00

xmodule

Merge branch 'release'

2014-03-29 20:37:49 -04:00

.coveragerc

…

setup.py

split testing support in the LMS.

2014-03-05 13:45:08 -05:00