summaryrefslogtreecommitdiffhomepage
path: root/.mailmap
diff options
context:
space:
mode:
authorKonstantin Pavlov <thresh@nginx.com>2023-08-31 09:41:46 -0700
committerKonstantin Pavlov <thresh@nginx.com>2023-08-31 09:41:46 -0700
commitc45c8919c7232eb20023484f6d1fc9f1f50395d8 (patch)
treecc12eb307c1611494948645e4b487fa06495c3d2 /.mailmap
parent88c90e1c351ab8c5bd487a5cd4b735014b08e271 (diff)
parent9b22b6957bc87b3df002d0bc691fdae6a20abdac (diff)
downloadunit-1.31.0-1.tar.gz
unit-1.31.0-1.tar.bz2
Merged with the default branch.1.31.0-1
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index b96dcabc..d6405683 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,4 @@
-<a.clayton@nginx.com> <andrew@digital-domain.net>
-<a.clayton@nginx.com> <a.clayton@f5.com>
+Alejandro Colomar <alx@nginx.com> <a.colomar@f5.com>
+Alejandro Colomar <alx@nginx.com> <alx.manpages@gmail.com>
+Andrew Clayton <a.clayton@nginx.com> <andrew@digital-domain.net>
+Andrew Clayton <a.clayton@nginx.com> <a.clayton@f5.com>