Skip to content
Commit 3b6a437b authored by Andreas Klöckner's avatar Andreas Klöckner
Browse files

Merge branch 'master' into pygit2 

Conflicts:
	README.rst
	course/content.py
	course/validation.py
	course/versioning.py
	courseflow/static/css/style.css
parents d1334264 7b4850c2
Expand all 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