Brian Talbot 2876554cd7 Merge branch 'master' into fix/btalbot/studio-sasscleanup

2013-03-20 17:09:38 -04:00

..

djangoapps

Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests

2013-03-20 10:20:11 -07:00

lib

Merge pull request #1709 from MITx/fix/cdodge/dont-compute-inherited-metadata-on-course-loads-with-depth-zero

2013-03-20 12:45:18 -07:00

static

Merge branch 'master' into fix/btalbot/studio-sasscleanup

2013-03-20 10:38:07 -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