Calen Pennington 8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/templates/widgets/header.html

2014-05-19 09:20:08 -04:00

..

capa

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-19 09:20:08 -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