John Jarvis 92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240 ...

Revert "Merge pull request #1240 from edx/dhm/config_separation"

2013-10-10 10:27:58 -07:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge pull request #1305 from edx/jarv/revert-1240

2013-10-10 10:27:58 -07: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