Brian Talbot 20553b00d3 resolving merge conflict with master

2013-02-15 09:32:38 -05:00

..

djangoapps

Move foldit app into the lms. No need for it in the cms, and it was breaking tests there..

2013-02-14 13:23:58 -05:00

lib

Merge pull request #1503 from MITx/fix/cdodge/export-policy-json

2013-02-14 12:47:37 -08:00

static

resolving merge conflict with master

2013-02-15 09:32:38 -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