Skip to content
Commit 17dbd35b authored by ifaint's avatar ifaint
Browse files

Merge branch 'final' 

Conflicts:
	course/templates/course/gradebook.html
parents 18be594e 4ebec536
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