Adam Palay e515842395 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-07-22 08:10:26 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-07-22 08:10:26 -04:00

setup.py

Revert setuptools upgrade

2015-07-15 09:36:56 -04:00