ichuang b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker ...

Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py

2013-02-06 18:15:36 -05:00

..

djangoapps

merged master

2013-02-06 17:13:52 -05:00

lib

Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker

2013-02-06 18:15:36 -05:00

static

merged master

2013-02-06 17:13:52 -05:00

templates

Update jquery ui. Overrode draggable w/ an in place fix for scroll

2013-01-25 12:44:58 -05:00

test

Fix some issues with peer grading service

2013-02-05 13:37:55 -05:00

xml_cleanup.py

Pep8 autofixes

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