alawibaba 5107d463c7 Merge branch 'master' into release ...

Conflicts:
	lms/envs/common.py (RESOLVED)

2015-03-12 13:20:45 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge branch 'master' into release

2015-03-12 13:20:45 -04:00

.coveragerc

Clean up coverage counting a little bit

2014-09-29 22:35:41 -04:00

setup.py

Library Content XModule

2015-01-12 13:37:56 +03:00