Ned Batchelder 9a106a32d5 Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

..

test_files

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00

xmodule

Merged master to rc/2013-11-21

2013-11-25 14:56:09 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

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

setup.py

Use XBlock handlers for handle_ajax in XModules

2013-11-08 11:08:48 -05:00