Skip to content
Commit 5f68147a authored by Dong Zhuang's avatar Dong Zhuang
Browse files

Merge branch 'master' of https://github.com/inducer/relate into multiple_text_question 

Conflicts:
	course/templates/course/custom-crispy-inline-form.html
parents 2f5a8ec5 43f67c40
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