diff options
author | Timo Tijhof <krinklemail@gmail.com> | 2018-04-18 02:05:33 +0100 |
---|---|---|
committer | Timo Tijhof <krinklemail@gmail.com> | 2018-04-18 02:10:45 +0100 |
commit | c5fad05ef78e2772d765c3ed01a1f32ffbc21228 (patch) | |
tree | 6cc3a2c7ea9e4718a5a36f5da720eb04a97ad40f /.mailmap | |
parent | 9ab7c3c572fb5991d6be528e7137a40b9b50f097 (diff) | |
download | mediawikicore-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-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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> |