Rollup merge of #58169 - boringcactus:patch-1, r=alexcrichton

kennytm · web-flow · commit 5f17ce24bd64 · 2019-02-06T00:29:17.000+09:00
Update contributor name in .mailmap following up on email correspondence with @steveklabnik
diff --git a/.mailmap b/.mailmap
@@ -155,6 +155,7 @@ Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu>
 Matthew Auld <matthew.auld@intel.com>
 Matthew McPherrin <matthew@mcpherrin.ca> <matt@mcpherrin.ca>
 Matthijs Hofstra <thiezz@gmail.com>
+Melody Horn <melody@boringcactus.com> <mathphreak@gmail.com>
 Michael Williams <m.t.williams@live.com>
 Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
 Mickaël Raybaud-Roig <raybaudroigm@gmail.com> m-r-r <raybaudroigm@gmail.com>

-Original file line number
+Diff line change
 Matthew Auld <[email protected]>
 Matthew McPherrin <[email protected]> <[email protected]>
 Matthijs Hofstra <[email protected]>
 +Melody Horn <[email protected]> <[email protected]>
 Michael Williams <[email protected]>
 Michael Woerister <michaelwoerister@posteo> <michaelwoerister@gmail>
 Mickaël Raybaud-Roig <[email protected]> m-r-r <[email protected]>