Rollup merge of #61125 - XAMPPRocky:master, r=jonas-schievink

Updated my mailmap entry
This commit is contained in:
Mazdak Farrokhzad 2019-05-25 04:55:41 +02:00 committed by GitHub
commit 98052b032f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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>