about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-11-19 23:58:47 +0100
committerGitHub <noreply@github.com>2020-11-19 23:58:47 +0100
commit39495cb342f87a7d0eabc7092b07014fa658b3d4 (patch)
tree9ea727fde761f1f3d0add16f705d727f253cb8f3
parent169e2212d9adcaa5684548a2f094dea15d49860e (diff)
parent54588c8434a7bb971e7e83d0573a0ef9a258820f (diff)
downloadrust-39495cb342f87a7d0eabc7092b07014fa658b3d4.tar.gz
rust-39495cb342f87a7d0eabc7092b07014fa658b3d4.zip
Rollup merge of #79204 - pickfire:patch-3, r=jyn514
Add jyn514 email alias to mailmap

r? ```@jyn514```
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index f4769268321..d3e400e5f90 100644
--- a/.mailmap
+++ b/.mailmap
@@ -148,6 +148,7 @@ Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
 Joseph Martin <pythoner6@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <josephtlyons@gmail.com>
 Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
+Joshua Nelson <jyn514@gmail.com> <joshua@yottadb.com>
 jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
 Junyoung Cho <june0.cho@samsung.com>
 Jyun-Yan You <jyyou.tw@gmail.com> <jyyou@cs.nctu.edu.tw>