Lyla Fischer 3f8246f032 merge conflict

2013-07-16 18:25:01 -04:00

..

test_files

Not sure why these had capital-I's in them, since the text just above shows lowercase-i's, and uppercase doesn't work properly.

2013-05-06 10:55:06 -04:00

xmodule

merge conflict

2013-07-16 18:25:01 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Working prototype of crowdsourced hinting module.

2013-07-01 18:03:35 -04:00