Rollup merge of rust-lang#79204 - pickfire:patch-3, r=jyn514

Dylan-DPC · web-flow · commit 39495cb342f8 · 2020-11-19T23:58:47.000+01:00
Add jyn514 email alias to mailmap

r? ```@jyn514```
diff --git 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>

-Original file line number
+Diff line change
 Joseph Martin <[email protected]>
 Joseph T. Lyons <[email protected]> <[email protected]>
 Joseph T. Lyons <[email protected]> <[email protected]>
 +Joshua Nelson <[email protected]> <[email protected]>
 jumbatm <[email protected]> <[email protected]>
 Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]> <[email protected]>