Skip to content
Commit 92af840a authored by Christopher Schäpers's avatar Christopher Schäpers
Browse files

Merge branch 'master' into css_cleanup_kondou

Conflicts:
	core/css/styles.css
	settings/templates/personal.php
parents 4818e006 ff86b6f1
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