Chris Dodge b6cde36db5 Merge branch 'release' ...

Conflicts:
	CHANGELOG.rst

2013-09-18 11:33:40 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge branch 'release'

2013-09-18 11:33:40 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Add Learning Tools Interoperability (LTI) blade.

2013-09-10 12:30:42 +03:00