Skip to content
Commit 838a4c3d authored by ifaint's avatar ifaint
Browse files

Merge branch 'master' into final 

Conflicts:
	course/grades.py
	course/templates/course/gradebook-single.html
	course/views.py
parents 36492525 97c2ea6e
Hide whitespace changes
Inline Side-by-side
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