Skip to content
Commit 92b10eb2 authored by Dong Zhuang's avatar Dong Zhuang
Browse files

Merge branch 'master' of https://github.com/dzhuang/relate 

Conflicts:
	course/enrollment.py
	course/flow.py
	course/models.py
parents eecb535b ebb187a9
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