Skip to content
Commit c16b3bb8 authored by Kristofer Rye's avatar Kristofer Rye
Browse files

Merge branch 'master' of git://github.com/github/gitignore into... 

Merge branch 'master' of git://github.com/github/gitignore into add-common-linux-compile-file-extensions

Conflicts:
	C.gitignore

Updates done.
parents 02bbff98 ecfdeba7
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment