Calen Pennington 31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 ...

Conflicts:
	cms/envs/common.py
	lms/envs/common.py

2014-03-10 16:21:08 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10

2014-03-10 16:21:08 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

split testing support in the LMS.

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