Arthur Barrett 24f519e32f Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.

2013-02-15 13:46:38 -05:00

..

test_files

…

xmodule

Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.

2013-02-15 13:46:38 -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

Merge branch 'master' into feature/abarrett/annotatable_xmodule

2013-02-12 12:09:21 -05:00