about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-06-15 14:40:52 +0200
committerGitHub <noreply@github.com>2024-06-15 14:40:52 +0200
commit128e2b479c8681a236071a1b84b5f0f751c4cc4d (patch)
tree4ae0c567849ec65ded86c289947e8a7746d970e5
parentd00e71ebb97a74fd7985f69fcbf035b3ae7defbf (diff)
parent297c97dbe087a9308eba2348fc86cad10f032ea6 (diff)
downloadrust-128e2b479c8681a236071a1b84b5f0f751c4cc4d.tar.gz
rust-128e2b479c8681a236071a1b84b5f0f751c4cc4d.zip
Rollup merge of #126511 - Enselic:mailmap, r=lqd
.mailmap: Associate both my work and my private email with me

Mainly so that 73 + 60 is summed to 133 on the [thanks](https://thanks.rust-lang.org/rust/all-time/) page.
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 0bd16a797ca..33673244be6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -379,6 +379,7 @@ Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com>
 Martin Carton <cartonmartin+git@gmail.com>
 Martin Habovštiak <martin.habovstiak@gmail.com>
 Martin Hafskjold Thoresen <martinhath@gmail.com>
+Martin Nordholts <martin.nordholts@codetale.se> <enselic@gmail.com>
 Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com>
 Mateusz Mikuła <mati865@gmail.com>
 Mateusz Mikuła <mati865@gmail.com> <mati865@users.noreply.github.com>