aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorTimo Tijhof <krinklemail@gmail.com>2018-04-18 02:05:33 +0100
committerTimo Tijhof <krinklemail@gmail.com>2018-04-18 02:10:45 +0100
commitc5fad05ef78e2772d765c3ed01a1f32ffbc21228 (patch)
tree6cc3a2c7ea9e4718a5a36f5da720eb04a97ad40f /.mailmap
parent9ab7c3c572fb5991d6be528e7137a40b9b50f097 (diff)
downloadmediawikicore-c5fad05ef78e2772d765c3ed01a1f32ffbc21228.tar.gz
mediawikicore-c5fad05ef78e2772d765c3ed01a1f32ffbc21228.zip
Update CREDITS and .mailmap
Before this change, running the script would add the following: * Cicalese: Duplicate. Fixed by adding another address to mailmap. Follows-up 3b55b0b3b8. * gopavasanth: Added. * Guycn2: Added. * Zoranzoki21: Duplicate. Fixed by normalising their name via mailmap. Also, remove the following added by 19ccff96086b70b: * GeoffreyT2000: Duplicate. Already normalised by mailmap. Change-Id: I5b11444a74dad090e484c2e256d32de5f6792943
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 77d2b8dd3d28..6c316171bdec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -109,6 +109,7 @@ Christopher Johnson <root@bugzilla.wmde.de>
church of emacs <churchofemacs@users.mediawiki.org>
Cindy Cicalese <ccicalese@wikimedia.org>
Cindy Cicalese <ccicalese@wikimedia.org> <cicalese@mitre.org>
+Cindy Cicalese <ccicalese@wikimedia.org> <cindom@gmail.com>
ckoerner <nobelx@gmail.com>
Conrad Irwin <conrad.irwin+wiki@gmail.com> <conrad@users.mediawiki.org>
Dan Duvall <dduvall@wikimedia.org>
@@ -474,6 +475,7 @@ Yuvi Panda <yuvipanda@gmail.com>
Zak Greant <zak+mediawiki@fooassociates.com> <zak@users.mediawiki.org>
Zhengzhu Feng <zhengzhu@gmail.com>
Zhengzhu Feng <zhengzhu@gmail.com> <zhengzhu@users.mediawiki.org>
+Zoranzoki21 <zorandori4444@gmail.com>
Zppix <support@zppixballee.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> <avar@users.mediawiki.org>
Étienne Beaulé <beauleetienne0@gmail.com>