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

Change subject: Remove duplicate names from CREDITS
......................................................................


Remove duplicate names from CREDITS

- "Michael M." was added manually, "Schnark" came from git log - see
https://phabricator.wikimedia.org/p/Schnark/ for the connection of both
names
- same email address, already in .mailmap
 - "victorbarbu" in Ib031bef17c8a7d708a5c7878e74967d19217bbc8
 - "Victor Barbu" in I5285dbfc47d6429e16b7e7839bf55d48320d0bf0
- same email address, added to mailmap
 - matejsuchanek in I4ef06d781bcb1aa0bc7b6d27c27cfde98390a367
 - Matěj Suchánek in Ib888634af281fc2347eaa389db4141782a98c15c

Change-Id: Ibc784dca10c9f74918daf1c3940f3cd17de1deda
---
M .mailmap
M CREDITS
2 files changed, 3 insertions(+), 5 deletions(-)

Approvals:
  Schnark: Looks good to me, but someone else must approve
  Matěj Suchánek: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, approved



diff --git a/.mailmap b/.mailmap
index c4f8604..c101be3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -281,6 +281,7 @@
 Matthias Mullie <[email protected]>
 Matthias Mullie <[email protected]> <[email protected]>
 Matěj Grabovský <[email protected]> <[email protected]>
+Matěj Suchánek <[email protected]>
 Max Semenik <[email protected]>
 Max Semenik <[email protected]> <[email protected]>
 Max Semenik <[email protected]> <[email protected]>
@@ -383,7 +384,7 @@
 Sam Smith <[email protected]>
 Santhosh Thottingal <[email protected]>
 Santhosh Thottingal <[email protected]> 
<[email protected]>
-Schnark <[email protected]>
+Schnark (Michael M.) <[email protected]>
 Scimonster <[email protected]>
 Sean Colombo <[email protected]> <[email protected]>
 Sean Pringle <[email protected]>
diff --git a/CREDITS b/CREDITS
index 6ab4ad3..ea011e8 100644
--- a/CREDITS
+++ b/CREDITS
@@ -394,7 +394,6 @@
 * Massaf
 * Matěj Grabovský
 * Matěj Suchánek
-* matejsuchanek
 * Mathias Ertl
 * mati
 * Matt Fitzpatrick
@@ -420,7 +419,6 @@
 * Michael Dale
 * Michael De La Rue
 * Michael Holloway
-* Michael M.
 * Michael Newton
 * Michael Walsh
 * Michał Łazowik
@@ -573,7 +571,7 @@
 * Sam Wilson
 * Santhosh Thottingal
 * saptaks
-* Schnark
+* Schnark (Michael M.)
 * Scimonster
 * scnd
 * Scott Colcord
@@ -670,7 +668,6 @@
 * Victor Barbu
 * Victor Porton
 * Victor Vasiliev
-* victorbarbu
 * Ville Stadista
 * vishnu
 * Vitaliy Filippov

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc784dca10c9f74918daf1c3940f3cd17de1deda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Schnark <[email protected]>
Gerrit-Reviewer: Thiemo Kreuz (WMDE) <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: Victorbarbu <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to