Vik Paruchuri 77ed921624 Prelim wiring on peer grading and combined open ended xmodules

2013-03-04 17:48:43 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

lib

Prelim wiring on peer grading and combined open ended xmodules

2013-03-04 17:48:43 -05:00

static

Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3

2013-03-01 16:13:30 -08:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

xml_cleanup.py

Pep8 autofixes

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