Don Mitchell 6c4aae731a Merge pull request #1980 from edx/dhm/locator_block_id ...

Rename BlockUsageLocator's block_id field from usage_id

2013-12-20 08:52:46 -08:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge pull request #1980 from edx/dhm/locator_block_id

2013-12-20 08:52:46 -08:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

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

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