Calen Pennington f4032caeaf Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py

2013-03-01 14:13:58 -05:00

..

test_files

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

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

xmodule

Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged

2013-03-01 14:13:58 -05: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

fix typo

2013-02-19 13:06:14 +02:00