Skip to content
Snippets Groups Projects
Commit e1bb725d authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Merge branch 'feature/gitattributes' 

Conflicts:
	vcsh
parents aa8a2066 c2802e6b
Show whitespace changes
Inline Side-by-side
Showing
with 3 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment