Skip to content
Snippets Groups Projects
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
Branches
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 75 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment