David Ormsbee 24e64e3946 Merge pull request #1773 from MITx/hotfix/dave/mult_choice_display ...

HOTFIX: Accept either a list of possible values, or a string as a value for

I'm pulling this in myself because it's urgent, it's the weekend, and I don't want this to get forgotten.

2013-03-30 08:55:45 -07:00

..

capa

Merge pull request #1773 from MITx/hotfix/dave/mult_choice_display

2013-03-30 08:55:45 -07:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Start converting COE storage model

2013-03-04 17:06:39 -05:00