aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2014-12-16 21:35:26 -0500
committerDave Methvin <dave.methvin@gmail.com>2014-12-16 21:35:26 -0500
commitf5374bf48d9e38cef69e693a2287ccc0ed984fae (patch)
tree60dec5c559817b8d1fe8bc0af8a6d559ff7efe7f
parentfc80c2f34e7be5b0637d94fe4f6fd4b5c70096c8 (diff)
downloadjquery-f5374bf48d9e38cef69e693a2287ccc0ed984fae.tar.gz
jquery-f5374bf48d9e38cef69e693a2287ccc0ed984fae.zip
Authors: Update AUTHORS.txt and .mailmap
-rw-r--r--.mailmap2
-rw-r--r--AUTHORS.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 53c5fdab2..6fa748e74 100644
--- a/.mailmap
+++ b/.mailmap
@@ -23,6 +23,7 @@ Danil Somsikov <danilasomsikov@gmail.com>
Dave Methvin <dave.methvin@gmail.com>
Dave Reed <dareed@microsoft.com>
David Fox <dfoxinator@gmail.com> <dfox@snap-interactive.com>
+David Hong <d.hong@me.com>
David Murdoch <david@davidmurdoch.com> <musicisair@yahoo.com>
Devin Cooper <cooper.semantics@gmail.com> <dcooper@snap-interactive.com>
Douglas Neiner <doug@dougneiner.com> <doug@pixelgraphics.us>
@@ -37,6 +38,7 @@ Ismail Khair <ismail.khair@gmail.com>
James Burke <jrburke@gmail.com>
James Padolsey <cla@padolsey.net> <jamespadolsey@gmail.com>
Jason Bedard <jason+jquery@jbedard.ca> <github@jbedard.ca>
+Jason Bedard <jason+jquery@jbedard.ca> <jason+github@jbedard.ca>
Jay Merrifield <fracmak@gmail.com>
Jay Merrifield <fracmak@gmail.com> <jmerrifiel@gannett.com>
Jean Boussier <jean.boussier@gmail.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 379b7b8d1..d0a36dde9 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -210,7 +210,7 @@ Chris Antaki <ChrisAntaki@gmail.com>
Marian Sollmann <marian.sollmann@cargomedia.ch>
njhamann <njhamann@gmail.com>
Ilya Kantor <iliakan@gmail.com>
-hongymagic <d.hong@me.com>
+David Hong <d.hong@me.com>
John Paul <john@johnkpaul.com>
Jakob Stoeck <jakob@pokermania.de>
Christopher Jones <chris@cjqed.com>
@@ -224,3 +224,4 @@ John Hoven <hovenj@gmail.com>
Philip Jägenstedt <philip@foolip.org>
Christian Kosmowski <ksmwsk@gmail.com>
Liang Peng <poppinlp@gmail.com>
+TJ VanToll <tj.vantoll@gmail.com>