Skip to content
Commit 2a420218 authored by Thomas Müller's avatar Thomas Müller
Browse files

Merge branch 'master' into delete-fix

Conflicts:
	core/css/styles.css
parents cdb993ad a94c55be
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