Chris Dodge 575ff02f8a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4 ...

Conflicts:
	jenkins/test.sh

2013-01-18 10:26:44 -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' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4

2013-01-18 10:26:44 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

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

jasmine_test_runner.html.erb

Visual Editor work.

2013-01-14 15:41:13 -05:00

setup.py

resolve merge conflicts

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