about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonas Schievink <jonasschievink@gmail.com>2020-11-23 15:25:55 +0100
committerGitHub <noreply@github.com>2020-11-23 15:25:55 +0100
commitea3c269b70ea9dd77453ab13b9cfec0f4e1df899 (patch)
tree22af08441df12586ed5c0ae7e02c9ca8615f380f
parent064c3c146a51646c550ba84cd2c98bda70416485 (diff)
parentc7d1189738f10ae80c804d1f977ace0179210615 (diff)
downloadrust-ea3c269b70ea9dd77453ab13b9cfec0f4e1df899.tar.gz
rust-ea3c269b70ea9dd77453ab13b9cfec0f4e1df899.zip
Rollup merge of #79343 - flip1995:mailmap, r=Mark-Simulacrum
Add my (@flip1995) work mail to the mailmap
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index d3e400e5f90..94f2938f11c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -230,6 +230,7 @@ Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
 Philipp Krones <hello@philkrones.com> flip1995 <hello@philkrones.com>
+Philipp Krones <hello@philkrones.com> <philipp.krones@embecosm.com>
 Philipp Matthias Schäfer <philipp.matthias.schaefer@posteo.de>
 Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
 Rafael Ávila de Espíndola <respindola@mozilla.com> Rafael Avila de Espindola <espindola@dream.(none)>