Merge branch 'release' into release-2015-07-08-conflict

Browse Source

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
	openedx/core/djangoapps/credit/tests/test_api.py

...

This commit is contained in:

Max Rothman

2015-07-17 11:32:01 -04:00

parent c0de94295a 1058c36d94

commit d7b57309da

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available