Chris Dodge e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge ...

Conflicts:
	requirements.txt

2013-01-03 10:46:24 -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/cms-master' into feature/cale/cms-master-merge

2013-01-03 10:46:24 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

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

jasmine_test_runner.html.erb

Bug fix for Lighthouse #22.

2012-12-12 12:57:31 -05:00

setup.py

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

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