Merge pull request #1432 from tgerring/develop

Adjust .mailmap
This commit is contained in:
Jeffrey Wilcke 2015-07-09 07:21:41 -07:00
commit 505b77a0d5

View File

@ -11,6 +11,7 @@ Nick Savers <nicksavers@gmail.com>
Maran Hidskes <maran.hidskes@gmail.com>
Taylor Gerring <taylor.gerring@gmail.com>
Taylor Gerring <taylor.gerring@gmail.com> <taylor.gerring@ethereum.org>
Bas van Kervel <bas@ethdev.com>
@ -57,4 +58,4 @@ Jason Carver <jacarver@linkedin.com>
Jason Carver <jacarver@linkedin.com> <ut96caarrs@snkmail.com>
Joseph Chow <ethereum@outlook.com>
Joseph Chow <ethereum@outlook.com> ethers <TODO>
Joseph Chow <ethereum@outlook.com> ethers <TODO>