Max Rothman c97314413b Merge branch 'release' into release-merge-test ...

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py

2015-07-17 17:42:03 -04:00

..

test_files

Integrate js-test-tool into testing infrastructure

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

xmodule

Merge branch 'release' into release-merge-test

2015-07-17 17:42:03 -04:00

setup.py

Revert setuptools upgrade

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