diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-03-03 17:50:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 17:50:14 +0900 |
| commit | 017a2f4ce6feca27092c04506ac6de52332ac369 (patch) | |
| tree | c29317e96dcc4bcc1d32b654518592ca067c2b74 | |
| parent | ef311d5ab41e4ada8de7411e4f47737409f3e6d5 (diff) | |
| parent | 4643b12f782fd4307a5ab1bc6809515cb053fbf1 (diff) | |
| download | rust-017a2f4ce6feca27092c04506ac6de52332ac369.tar.gz rust-017a2f4ce6feca27092c04506ac6de52332ac369.zip | |
Rollup merge of #69633 - XAMPPRocky:master, r=Dylan-DPC
Update my mailmap entry superceding #68891
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap index e5aad52ef4b..ea8ef0eebf9 100644 --- a/.mailmap +++ b/.mailmap @@ -5,7 +5,6 @@ # email addresses. # -Aaron Power <theaaronepower@gmail.com> Erin Power <xampprocky@gmail.com> Aaron Todd <github@opprobrio.us> Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com> Adolfo Ochagavía <aochagavia92@gmail.com> @@ -84,6 +83,8 @@ Eric Holk <eric.holk@gmail.com> <eholk@mozilla.com> Eric Holmes <eric@ejholmes.net> Eric Reed <ecreed@cs.washington.edu> <ereed@mozilla.com> Erick Tryzelaar <erick.tryzelaar@gmail.com> <etryzelaar@iqt.org> +Erin Power <xampprocky@gmail.com> <theaaronepower@gmail.com> +Erin Power <xampprocky@gmail.com> <Aaronepower@users.noreply.github.com> Esteban Küber <esteban@kuber.com.ar> <esteban@commure.com> Esteban Küber <esteban@kuber.com.ar> <estebank@users.noreply.github.com> Esteban Küber <esteban@kuber.com.ar> <github@kuber.com.ar> |