ihoover 3d669eabe0 fix merge conflicts with master

2013-07-19 16:03:13 -04:00

..

djangoapps

fix merge conflicts with master

2013-07-19 16:03:13 -04:00

lib

Merge pull request #394 from edx/fix/foldit-leaderboard

2013-07-19 12:09:37 -07:00

static

Added support for a new problem type: ChoicetextResponse

2013-07-18 10:12:56 -07:00

templates

Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194

2013-07-16 09:20:35 -04:00

test

Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe

2013-07-18 11:55:37 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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