浏览代码

Update .mailmap

ADmad 8 年之前
父节点
当前提交
57f9670b2e
共有 1 个文件被更改,包括 10 次插入1 次删除
  1. 10 1
      .mailmap

+ 10 - 1
.mailmap

@@ -1,5 +1,6 @@
 Mark Story <mark@mark-story.com>
 Mark Story <mark@mark-story.com> <mark@freshbooks.com>
+Mark Story <mark@mark-story.com> <markstory@freshbooks.com>
 José Lorenzo Rodríguez <jose.zap@gmail.com>
 José Lorenzo Rodríguez <jose.zap@gmail.com> <lorenzo@users.noreply.github.com>
 José Lorenzo Rodríguez <jose.zap@gmail.com> José Lorenzo Rodríguez Urdaneta <lorenzo@Venus-2.local>
@@ -41,9 +42,11 @@ dogmatic69 <dogmatic69@gmail.com>
 Majna <majnaggz@gmail.com>
 Robert Pustułka <robert.pustulka@gmail.com>
 Robert Pustułka <robert.pustulka@gmail.com> <r.pustulka@zano.pl>
+Robert Pustułka <robert.pustulka@gmail.com> <r.pustulka@robotusers.com>
 Thomas Ploch <t.ploch@reizwerk.com>
 Tigran Gabrielyan <tigrangab@gmail.com>
-Bryan Crowe <bryan@zapsolutions.com>
+Bryan Crowe <bryan@bryan-crowe.com>
+Bryan Crowe <bryan@bryan-crowe.com> <bryan@zapsolutions.com>
 Sam <sgpinkus@gmail.com>
 Jorge González <steinkel@gmail.com>
 Saleh Souzanchi <saleh.souzanchi@gmail.com>
@@ -102,3 +105,9 @@ Matt Alexander <alexandma@advisory.com>
 Matt Alexander <alexandma@advisory.com> <mattalexx@gmail.com>
 Mark van Driel <mvdriel@mvdriel-EP35-DS3R>
 Mark van Driel <mvdriel@mvdriel-EP35-DS3R> <mvdriel@mvdriel-UL30>
+Juan Basso <jrbasso@gmail.com>
+Juan Basso <jrbasso@gmail.com> <juan.basso@digitro.com.br>
+antograssiot <antograssiot@free.fr>
+antograssiot <antograssiot@free.fr> <agrassiot@tld-europe.com>
+Patrick Conroy <patrick.conroy@rockstargames.com>
+Patrick Conroy <patrick.conroy@rockstargames.com> <patrick@rockstargames.com>