Adam Palay 7e45858276 resolve merge conflicts between release and master

2015-01-12 13:47:30 -05:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

resolve merge conflicts between release and master

2015-01-12 13:47:30 -05:00

.coveragerc

Clean up coverage counting a little bit

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

setup.py

Split mongo support for libraries and Library XBlock

2014-12-04 21:39:10 +07:00