ichuang b5ba88f0af Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker ...

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

2013-02-06 18:15:36 -05:00

..

test_files

…

xmodule

Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker

2013-02-06 18:15:36 -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

Pep8 autofixes

2013-02-06 11:13:50 -05:00