Arthur Barrett 946af8e189 Merge branch 'master' into feature/abarrett/annotation-styling-fixes

2013-03-11 16:27:55 -04:00

..

djangoapps

Merge pull request #1628 from MITx/feature/cale/heartbeat-metrics

2013-03-08 08:59:44 -08:00

lib

Merge branch 'master' into feature/abarrett/annotation-styling-fixes

2013-03-11 16:27:55 -04:00

static

remove links to missing image files. We can add them if needed later.

2013-03-06 19:11:36 -05:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

remove empty attempts and weights from simple test course

2013-02-21 15:41:59 -05:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00