Adam Palay b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master ...

Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py

2015-03-19 16:30:46 -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 adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

.coveragerc

Clean up coverage counting a little bit

2014-09-29 22:35:41 -04:00

setup.py

Library Content XModule

2015-01-12 13:37:56 +03:00