Diana Huang ae65bb0332 Merge branch 'master' into feature/diana/rubric-input ...

Conflicts:
	common/lib/capa/capa/inputtypes.py

2013-01-14 13:40:45 -05:00

..

capa

Merge branch 'master' into feature/diana/rubric-input

2013-01-14 13:40:45 -05:00

.coveragerc

Exclude settings.py files from coverage reports and configure titles for the reports.

2012-12-17 15:00:11 -05:00

setup.py

add pyparsing to requirements for capa lib

2012-07-10 14:12:32 -04:00