marco 81a2ac413d Merge branch 'release' ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2013-10-01 17:05:02 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge branch 'release'

2013-10-01 17:05:02 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Update XBlock requirement to new XML code.

2013-09-30 21:09:43 -04:00