]> source.dussan.org Git - gitignore.git/commit
Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch
authorAdam Roben <adam@roben.org>
Fri, 28 Feb 2014 16:36:57 +0000 (11:36 -0500)
committerAdam Roben <adam@roben.org>
Fri, 28 Feb 2014 16:36:57 +0000 (11:36 -0500)
commitc096a6566a8666e99aff5af76c941d21f21c243b
tree32601d8923e854fbc760021cead74dbc18e1b7fa
parentf3f11fb2f1e77eb4ec22bf933239830090ff933e
parent22f0d933d431a2388af9aeb34d0087f267d461dc
Merge branch 'master' of https://github.com/github/gitignore into stuartpb-node-patch

Conflicts:
Node.gitignore