Calen Pennington ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic ...

Don't run collectstatic on course content

2013-01-30 12:07:47 -08:00

..

test_files

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

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

xmodule

Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic

2013-01-30 12:07:47 -08:00

.coveragerc

perform a new merge from master, resolve conflicts

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

jasmine_test_runner.html.erb

Add missing requirejs for xmodule jasmine tests

2013-01-29 16:09:27 -05:00

setup.py

resolve merge conflicts

2013-01-17 09:36:09 -05:00