Chris Dodge 7229a9cdaf perform a new merge from master, resolve conflicts

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

..

test_files

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

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

xmodule

perform a new merge from master, resolve conflicts

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

.coveragerc

perform a new merge from master, resolve conflicts

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

jasmine_test_runner.html.erb

Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc.

2012-11-15 15:43:39 -05:00

setup.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-13 10:22:42 -05:00