Brian Talbot a5e2b5c53a resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -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

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

static

studio - resolving merge from master

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