Arthur Barrett 5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule

2013-03-06 13:51:18 -05:00

..

capa

fixed tag prompt default text

2013-02-28 16:31:15 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

locking deps versions based on pip freeze in production.

2013-03-01 10:15:07 -05:00