]> source.dussan.org Git - gitignore.git/commitdiff
Merge branch 'master' of github.com:leandrodeleite/gitignore
authorleandrodeleite <leandrodeleite@gmail.com>
Thu, 16 Oct 2014 22:29:40 +0000 (19:29 -0300)
committerleandrodeleite <leandrodeleite@gmail.com>
Thu, 16 Oct 2014 22:29:40 +0000 (19:29 -0300)
Conflicts:
Scala.gitignore


Trivial merge