Carlos Andrés Rocha 06529054de Merge hotfix 2013-07093 into master ...

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

2013-07-03 18:55:21 -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 hotfix 2013-07093 into master

2013-07-03 18:55:21 -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