cahrens 17c710af83 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/templates/combinedopenended/default.yaml

2013-05-27 20:08:09 -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 branch 'master' into feature/christina/metadata-ui

2013-05-27 20:08:09 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

adds initial word_cloud_module files

2013-05-13 14:44:00 +03:00