Don Mitchell 8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"" ...

This reverts commit a517dc2085.

2013-10-18 09:22:30 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

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

2013-10-18 09:22:30 -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