]> source.dussan.org Git - gitignore.git/commit
Merge branch 'master' of https://github.com/github/gitignore 403/head
authorAli Servet Donmez <asd@pittle.org>
Mon, 27 Aug 2012 10:40:37 +0000 (12:40 +0200)
committerAli Servet Donmez <asd@pittle.org>
Mon, 27 Aug 2012 10:40:37 +0000 (12:40 +0200)
commit964de38e9b75e3c716496180001e1765ca3ecd9d
tree53fcf49f0588b2ea49ed5eaa5fef2bf51a34a942
parent54928f53d7d058f3b96a5a812e49184f2e9ee48b
parentf1cb24b9c2cc212f241256955ff12081896e7a66
Merge branch 'master' of https://github.com/github/gitignore

Conflicts:
Global/OSX.gitignore
Global/OSX.gitignore