Brian Talbot 524db5e3f9 Merge branch 'master' into fix/btalbot/studio-sasscleanup

2013-03-11 11:35:25 -04:00

..

djangoapps

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

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

lib

Update tests with new attributes.

2013-03-11 10:29:18 -04:00

static

studio - further small cleanup on Sass

2013-03-08 12:44:24 -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