Kevin Chugh 8d766c4b51 fix conflict

2013-03-13 21:01:37 -04:00

..

djangoapps

Add logging to debug strange cohort behavior on prod.

2013-03-11 15:24:14 -07:00

lib

Merge pull request #1660 from MITx/hotfix/jkarni/folditorder

2013-03-12 16:17:08 -07:00

static

fix conflict

2013-03-13 21:01:37 -04: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