Skip to content
Snippets Groups Projects
Commit d8f8d8c6 authored by Calen Pennington's avatar Calen Pennington
Browse files

Merge branch 'release/1.0' 

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py
parents 1d1a9173 1d5e42f1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 33 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