aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorTheresNoTime <starling@wikimedia.org>2023-08-21 10:40:45 +0100
committerSamtar <starling@wikimedia.org>2023-10-09 14:07:15 +0000
commit25312c06dec27172c3fdcc048ace744f2f78cc9a (patch)
tree74827ceb46508db3a3a84cc19f2144a7c8e23cf0 /.mailmap
parent4c535f9978778f557006545b84ec04b31a9ff9c7 (diff)
downloadmediawikicore-25312c06dec27172c3fdcc048ace744f2f78cc9a.tar.gz
mediawikicore-25312c06dec27172c3fdcc048ace744f2f78cc9a.zip
mailmap: Update .mailmap and CREDITS
Change-Id: I1676f33868f4ed0e5d6ee9552923fca3ab9cbede
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 29f48ccf4672..0c5b933d76bd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -436,8 +436,9 @@ Sam Reed <reedy@wikimedia.org> <reedy@formey.wikimedia.org>
Sam Reed <reedy@wikimedia.org> <reedy@users.mediawiki.org>
Sam Smith <git@samsmith.io>
Sammy Tarling <sam@theresnotime.co.uk>
-Sammy Tarling <starling-ctr@wikimedia.org>
-Sammy Tarling <starling-ctr@wikimedia.org> <theresnotime@wikimedia.org>
+Sammy Tarling <starling@wikimedia.org>
+Sammy Tarling <starling@wikimedia.org> <theresnotime@wikimedia.org>
+Sammy Tarling <starling@wikimedia.org> <starling-ctr@wikimedia.org>
Santhosh Thottingal <santhosh.thottingal@gmail.com>
Santhosh Thottingal <santhosh.thottingal@gmail.com> <santhosh@users.mediawiki.org>
Schnark (Michael M.) <listenleser@gmail.com>