Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-05-10 23:47:32 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-05-10 23:47:33 +0300
commitc1251fd1bcf6a3f3ec03aed5980160a1d5f057a4 (patch)
tree2dd11ba1dcde209f1452155479ae24cf571112df /.mailmap
parent084da530767991605b045a6183a3857f14b1b502 (diff)
Add Joeliam to .mailmap and sync AUTHORS.
In PR #2248, I promised to change the commit's author before landing. I didn't. This adds an entry to the .mailmap to make up for that.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index bd843c2e0..ab02bdfe6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -102,3 +102,6 @@ John Marion <john@lmsn.net> <LuaMilkshake@users.noreply.github.com>
# Alias of Derrick Dymock <actown@gmail.com
Derrick Dymock <actown@gmail.com> Derrick Dymock <derrick@puppetlabs.com>
+
+# Alias of Joel Kees <joelkees@gmail.com>
+Joel Kees <joelkees@gmail.com> Joeliam <joelkees@gmail.com>