Adam Palay 300f7f13a6 fix pep8 and pylint errors ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	lms/envs/common.py

2013-09-03 14:55:11 -04:00

..

capa

fix pep8 and pylint errors

2013-09-03 14:55:11 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Pin capa to require distribute greater than 28 because an old branch had it at 30

2013-05-31 11:24:49 -04:00