about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-05-25 04:55:41 +0200
committerGitHub <noreply@github.com>2019-05-25 04:55:41 +0200
commit98052b032f4d022a642192f042cbbebba6f5e8f9 (patch)
treeab5d8b67d0ea553398ac9c372464f494a6736043
parentdeaacafc1161f4f74a25ebb2c76afde62b90f6be (diff)
parentaba152d14cb6071bbfa02283b4b19b1135b193a4 (diff)
downloadrust-98052b032f4d022a642192f042cbbebba6f5e8f9.tar.gz
rust-98052b032f4d022a642192f042cbbebba6f5e8f9.zip
Rollup merge of #61125 - XAMPPRocky:master, r=jonas-schievink
Updated my mailmap entry
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 63a49cd4132..2d5759b539e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,7 +6,7 @@
 #
 
 Aaron Todd <github@opprobrio.us>
-Aaron Power <theaaronepower@gmail.com>
+Aaron Power <theaaronepower@gmail.com> Erin Power <xampprocky@gmail.com>
 Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
 Adolfo Ochagavía <aochagavia92@gmail.com>
 Adrien Tétar <adri-from-59@hotmail.fr>