summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-01-27 14:41:28 -0800
committerAlex Crichton <alex@alexcrichton.com>2017-01-27 16:42:07 -0800
commit86af9a19ecb0760505e0b01d107572b303f5aace (patch)
tree651fdd65f19f1116318e0def35d0a11df15df646 /.mailmap
parentRollup merge of #39345 - steveklabnik:carol-mailmap, r=alexcrichton (diff)
parentFix @jethrogb's mailmap entry (diff)
downloadgrust-86af9a19ecb0760505e0b01d107572b303f5aace.tar.gz
grust-86af9a19ecb0760505e0b01d107572b303f5aace.tar.bz2
grust-86af9a19ecb0760505e0b01d107572b303f5aace.tar.xz
Rollup merge of #39346 - steveklabnik:jethro-mailmap, r=brson
Fix @jethrogb's mailmap entry cc rust-lang-nursery/thanks#51
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 90a5e0f5f3..883a29975d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,6 +102,7 @@ Jason Toffaletti <toffaletti@gmail.com> Jason Toffaletti <jason@topsy.com>
102Jauhien Piatlicki <jauhien@gentoo.org> Jauhien Piatlicki <jpiatlicki@zertisa.com> 102Jauhien Piatlicki <jauhien@gentoo.org> Jauhien Piatlicki <jpiatlicki@zertisa.com>
103Jay True <glacjay@gmail.com> 103Jay True <glacjay@gmail.com>
104Jeremy Letang <letang.jeremy@gmail.com> 104Jeremy Letang <letang.jeremy@gmail.com>
105Jethro Beekman <github@jbeekman.nl>
105Jihyun Yu <j.yu@navercorp.com> <yjh0502@gmail.com> 106Jihyun Yu <j.yu@navercorp.com> <yjh0502@gmail.com>
106Jihyun Yu <j.yu@navercorp.com> jihyun <jihyun@nablecomm.com> 107Jihyun Yu <j.yu@navercorp.com> jihyun <jihyun@nablecomm.com>
107Jihyun Yu <j.yu@navercorp.com> Jihyun Yu <jihyun@nclab.kaist.ac.kr> 108Jihyun Yu <j.yu@navercorp.com> Jihyun Yu <jihyun@nclab.kaist.ac.kr>