about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2020-01-24 00:31:00 -0800
committerGitHub <noreply@github.com>2020-01-24 00:31:00 -0800
commita7e2ac41ed3538d2a664b927520c6cd32683f43f (patch)
treed3b74ec56a613b600f5c0ed08a8e9267e15c7bfa
parent16628881266921e3096aedcf70799060de0e7f21 (diff)
parent06064b99fd62116c3c96d60b4b1cc78dbac4669d (diff)
downloadrust-a7e2ac41ed3538d2a664b927520c6cd32683f43f.tar.gz
rust-a7e2ac41ed3538d2a664b927520c6cd32683f43f.zip
Rollup merge of #68483 - flip1995:mailmap, r=Dylan-DPC
Add my (@flip1995) name to .mailmap
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 1634c2da518..6ab6be26cf1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -211,6 +211,7 @@ Peter Liniker <peter.liniker+github@gmail.com>
 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 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)>