Arthur Barrett 1b08071fdc merged from master and resolved conflict with annotatable module.

2013-03-18 15:51:27 -04:00

..

djangoapps

Pep8 fixes

2013-03-18 13:57:26 -04:00

lib

merged from master and resolved conflict with annotatable module.

2013-03-18 15:51:27 -04:00

static

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

2013-03-15 10:33:54 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

fix test_conditional, add new conditional to "conditional_and_poll" test course

2013-03-06 19:52:18 +02:00

xml_cleanup.py

Pep8 autofixes

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