Feanil Patel aa6565959d Merge branch 'release' ...

Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py

2015-05-05 16:27:45 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge branch 'release'

2015-05-05 16:27:45 -04:00

.coveragerc

Clean up coverage counting a little bit

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

setup.py

Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock

2015-03-31 09:43:52 -04:00