]> source.dussan.org Git - gitignore.git/commit
projects / gitignore.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 182aeb2 7bbc288)
Merge branch 'master' into patch-1 636/head
authorMichael Gerbush <michaelg@spiceworks.com>
Thu, 7 Nov 2013 19:04:32 +0000 (13:04 -0600)
committerMichael Gerbush <michaelg@spiceworks.com>
Thu, 7 Nov 2013 19:04:32 +0000 (13:04 -0600)
commit95075cccba0e117228071667d908df497936b3fe
treecb755766987970fd52de92236729cd6a5dc4b829tree | snapshot
parent182aeb220dc2ebffc4e22936b19deb50b071d4a2commit | diff
parent7bbc288b527710d20cc68d7c114ddb8392f97d62commit | diff
Merge branch 'master' into patch-1

Conflicts:
Objective-C.gitignore
Objective-C.gitignore diff1 | diff2 | blob | history
A collection of useful .gitignore templates: https://github.com/github/gitignore