Skip to content
Snippets Groups Projects
Commit d7b57309 authored by Max Rothman's avatar Max Rothman
Browse files

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

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/templates/courseware/progress.html
	openedx/core/djangoapps/credit/tests/test_api.py
parents c0de9429 1058c36d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment