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

if we're loading a course module with depth = 0, then we don't need to f...

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

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

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

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Clean up some JS errors showing up in the xmodule jasmine tests

2013-01-30 09:31:20 -05:00

setup.py

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

2013-03-08 00:40:18 -05:00