aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorPascal Quantin <pascal@wireshark.org>2020-10-06 21:24:29 +0200
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2020-10-06 20:21:53 +0000
commit6590affa67822a8a1f88309cd7b33304ebfa68cf (patch)
tree2bf85c94519d66a72f60cf76aff46bee3b6429ff /.mailmap
parent35c69efaf4450ad32c5f0fc4dcf7dd636e0c89a3 (diff)
Update .mailmap after g2402521a
Gitlab squash commits function did not pick the right user name
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5a084598d7..ddbd2dbe52 100644
--- a/.mailmap
+++ b/.mailmap
@@ -64,6 +64,7 @@ Dmitry Lazurkin <dilaz03@gmail.com> Dmitry Lazurkin <dmitry.lazurkin@synesis.ru>
Dr. Lars Voelker <lars-github@larsvoelker.de> Dr. Lars Voelker <lars.voelker@bmw.de>
Dylan Ulis <daulis0@gmail.com> D. Ulis <daulis0@gmail.com>
Ed Beroset <beroset@ieee.org> Ed Beroset <beroset@mindspring.com>
+Edward Smith <edward.smith@nowlegent.com> Ed <edward.smith@nowlegent.com>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
Erik de Jong <erikdejong@gmail.com> erikdejong <erikdejong@gmail.com>
Eugene Adell <eugene.adell@gmail.com> Eugene Adell <eugene.adell@d2-si.eu>