Ned Batchelder faa8f16fff Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed ...

Update 12/3 RC branch with the part of the hotfix we want permanently.

2013-12-06 07:49:46 -08:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed

2013-12-06 07:49:46 -08:00

.coveragerc

…

setup.py

Resolve conflicts merging master to rc/2013-11-21

2013-11-27 11:55:44 -05:00