aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorTimo Tijhof <krinklemail@gmail.com>2017-05-21 16:18:36 +0200
committerTimo Tijhof <krinklemail@gmail.com>2017-05-21 16:18:36 +0200
commita5185ac611d19c55d736c9f93b471c0c05039520 (patch)
tree6a1252110566791a0fa940cc16d38b7d75b73142 /CREDITS
parent0e9d9a1c148ebba544d565cfed01c4d861fd7fea (diff)
downloadmediawikicore-a5185ac611d19c55d736c9f93b471c0c05039520.tar.gz
mediawikicore-a5185ac611d19c55d736c9f93b471c0c05039520.zip
Update CREDITS
Also update mailmap to avoid duplicates. Change-Id: Ic305027c47a96d6d7ea8892823c4ceb687f17e13
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 5 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 1530425123c8..14c454e379ea 100644
--- a/CREDITS
+++ b/CREDITS
@@ -16,6 +16,7 @@ The following list can be found parsed under Special:Version/Credits -->
* Aashaka Shah
* abhinand
* Abhishek Das
+* Ad Huikeshoven
* Adam Miller
* Adam Roses Wight
* addshore
@@ -358,6 +359,7 @@ The following list can be found parsed under Special:Version/Credits -->
* Ltrlg
* Luc Van Oostenryck
* Lucas Garczewski
+* Lucas Werkmeister
* Luigi Corsaro
* Luis Felipe Schenone
* Luke Faraone
@@ -434,6 +436,7 @@ The following list can be found parsed under Special:Version/Credits -->
* Mohamed Magdy
* Molly White
* Moriel Schottlender
+* Moritz Oberhauser
* Mormegil
* Mr. E23
* MrBlueSky
@@ -618,10 +621,11 @@ The following list can be found parsed under Special:Version/Credits -->
* 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