jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/354992 )

Change subject: Update CREDITS
......................................................................


Update CREDITS

Also update mailmap to avoid duplicates.

Change-Id: Ic305027c47a96d6d7ea8892823c4ceb687f17e13
---
M .mailmap
M CREDITS
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/.mailmap b/.mailmap
index ae18878..e649fb1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -412,6 +412,7 @@
 Sumit Asthana <asthana.sumi...@gmail.com>
 TerraCodes <terraco...@tools.wmflabs.org>
 Thalia Chan <tha...@cantorion.org>
+Thalia Chan <tha...@cantorion.org> <thalia.e.c...@googlemail.com>
 Thiemo Mättig <thiemo.maet...@wikimedia.de>
 Thiemo Mättig <thiemo.maet...@wikimedia.de> <mr.h...@gmx.de>
 This, that and the other <at.li...@live.com.au>
diff --git a/CREDITS b/CREDITS
index 1530425..14c454e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -16,6 +16,7 @@
 * Aashaka Shah
 * abhinand
 * Abhishek Das
+* Ad Huikeshoven
 * Adam Miller
 * Adam Roses Wight
 * addshore
@@ -358,6 +359,7 @@
 * Ltrlg
 * Luc Van Oostenryck
 * Lucas Garczewski
+* Lucas Werkmeister
 * Luigi Corsaro
 * Luis Felipe Schenone
 * Luke Faraone
@@ -434,6 +436,7 @@
 * Mohamed Magdy
 * Molly White
 * Moriel Schottlender
+* Moritz Oberhauser
 * Mormegil
 * Mr. E23
 * MrBlueSky
@@ -618,10 +621,11 @@
 * T.D. Corell
 * Tarquin
 * TerraCodes
+* Thalia Chan
 * The Discoverer
 * The Evil IP address
 * theopolisme
-* Thiemo Mättig (WMDE)
+* Thiemo Mättig
 * This, that and the other
 * tholam
 * Thomas Arrow

-- 
To view, visit https://gerrit.wikimedia.org/r/354992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic305027c47a96d6d7ea8892823c4ceb687f17e13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to