aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski <m.goleb@gmail.com>2013-03-13 10:44:05 -0400
committerTimmy Willison <timmywillisn@gmail.com>2013-03-13 10:58:55 -0400
commite0416f25485c67ccf35b6c309bbc69128770a27e (patch)
treec40876c0ce0df993f01b4e1f174b5d7f1b848568
parent79992d752393d80822a4f8be2b7bec3ecdd60f6a (diff)
downloadjquery-e0416f25485c67ccf35b6c309bbc69128770a27e.tar.gz
jquery-e0416f25485c67ccf35b6c309bbc69128770a27e.zip
Authors update for Michał Gołębiowski. Add .mailmap entry for my old commits too. Closes gh-1201.
-rw-r--r--.mailmap3
-rw-r--r--AUTHORS.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..05b4a1383
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Michał Gołębiowski <m.goleb@gmail.com> <michal.golebiowski@laboratorium.ee>
+Timmy Willison <timmywillisn@gmail.com>
+Timmy Willison <timmywillisn@gmail.com> <tim.willison@thisismedium.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 5bbfb7d5f..aba1f8123 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -163,4 +163,4 @@ Adam Coulombe <me@adam.co>
Andrew Plummer <plummer.andrew@gmail.com>
Nguyen Phuc Lam <ruado1987@gmail.com>
Dmitry Gusev <dmitry.gusev@gmail.com>
-Michał Z. Gołębiowski <michal.golebiowski@laboratorium.ee>
+Michał Gołębiowski <m.goleb@gmail.com>