Skip to content
Commit 323f4641 authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into coursely-rename 

Conflicts:
	course/flow.py
parents 4b918057 244da87d
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