Jean Manuel Nater 3c67e2754a Merge branch 'master' into jnater/courseware_tests ...

Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py

2013-06-27 13:53:47 -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 jnater/courseware_tests

2013-06-27 13:53:47 -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