summaryrefslogtreecommitdiffhomepage
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap20
1 files changed, 18 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index d6405683..23a492fa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,20 @@
-Alejandro Colomar <alx@nginx.com> <a.colomar@f5.com>
-Alejandro Colomar <alx@nginx.com> <alx.manpages@gmail.com>
+Alejandro Colomar <alx@kernel.org> <alx@nginx.com>
+Alejandro Colomar <alx@kernel.org> <a.colomar@f5.com>
+Alejandro Colomar <alx@kernel.org> <alx.manpages@gmail.com>
+Andrei Zeliankou <zelenkov@nginx.com>
+Andrei Zeliankou <zelenkov@nginx.com> <xim.andrew@gmail.com>
Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>
+Artem Konev <artem.konev@nginx.com> <41629299+artemkonev@users.noreply.github.com>
+Dan Callahan <d.callahan@f5.com> <dan.callahan@gmail.com>
+Danielle De Leo <d.deleo@f5.com> <danielle@fastmail.net>
+Dylan Arbour <d.arbour@f5.com> <arbourd@users.noreply.github.com>
+Konstantin Pavlov <thresh@nginx.com> <thresh@videolan.org>
+Konstantin Pavlov <thresh@nginx.com> <pavlov.konstantin@gmail.com>
+Max Romanov <max.romanov@gmail.com> <max.romanov@nginx.com>
+OutOfFocus4 <jeff.iadarola@gmail.com> <jeffrey_iadarola@urmc.rochester.edu>
+Sergey A. Osokin <sergey.osokin@nginx.com> <osa@FreeBSD.org.ru>
+Taryn Musgrave <t.musgrave@f5.com> <34845739+tarynmusgrave@users.noreply.github.com>
+Tiago Natel de Moura <t.nateldemoura@f5.com>
+Timo Stark <t.stark@nginx.com> <tippexs91@googlemail.com>
+Zhidao HONG <z.hong@f5.com> <hongzhidao@gmail.com>