]> source.dussan.org Git - gitignore.git/commit
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)
commitb2268f2b54267646878bbea780622887ff3eb668
tree7f43ece1ef2cac026f8bb5327cfac5932019c5ac
parent437193990b976ff5cb57c1635e9ec007f536b1bf
parentfbdea1ab367a4e8e8648bdade37a92ea4f2664d5
Merge branch 'master' of github.com:leandrodeleite/gitignore

Conflicts:
Scala.gitignore