about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2017-02-02 22:22:33 +0100
committerGitHub <noreply@github.com>2017-02-02 22:22:33 +0100
commitd09e4de640de7632f82f034ef48f73e4ec0ea4ca (patch)
tree6aecbbce96b60f7526484eab622ad2817fc55dfc
parenta561ad831d4394a54b872d6f91e0b700fabf4f89 (diff)
parent4b52600b152a2220dca847046962a6f37a773378 (diff)
downloadrust-d09e4de640de7632f82f034ef48f73e4ec0ea4ca.tar.gz
rust-d09e4de640de7632f82f034ef48f73e4ec0ea4ca.zip
Rollup merge of #39427 - steveklabnik:pliniker-mailmap, r=alexcrichton
update mailmap for @pliniker
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index c44c486831a..1ae0aae2d01 100644
--- a/.mailmap
+++ b/.mailmap
@@ -167,6 +167,7 @@ Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.c
 Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
 Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
 Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu>
+Peter Liniker <peter.liniker+github@gmail.com>
 Peter Zotov <whitequark@whitequark.org>
 Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>