X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=.mailmap;h=232824d7ccc618074c5914a26cba675aee131374;hb=da572fe7a46c3be4d55e31dc355c5f1675cdc251;hp=6d9f8e8bcb782c1910b1dc5401862f3e36a1efcf;hpb=cf5c36ccfd8dce53ea8d3631b1902050e93d4acd;p=lhc%2Fweb%2Fwiklou.git diff --git a/.mailmap b/.mailmap index 6d9f8e8bcb..232824d7cc 100644 --- a/.mailmap +++ b/.mailmap @@ -3,18 +3,18 @@ # # To update the CREDITS file, run maintenance/updateCredits.php # -# Two types of entries are useful here. The first sets a cannonical author +# Two types of entries are useful here. The first sets a canonical author # name for a given email address: # -# Cannonical Author Name +# Canonical Author Name # # The second allows collecting alternate email addresses into a single -# cannonical author name and email address: +# canonical author name and email address: # -# Cannonical Author Name +# Canonical Author Name # # Mappings are only needed for authors who have used multiple author names -# and/or author emails for revisions over time. Author names begenning with +# and/or author emails for revisions over time. Author names beginning with # "[BOT]" will be omitted from the CREDITS file. # # See also: https://git-scm.com/docs/git-shortlog#_mapping_authors @@ -32,9 +32,9 @@ addshore Aditya Sastry Adrian Heine Alex Z. -Alexander Emsenhuber -Alexander Emsenhuber -Alexander Emsenhuber +Alexandre Emsenhuber +Alexandre Emsenhuber +Alexandre Emsenhuber Alexander Monk Alexander Monk Alexander Monk @@ -93,6 +93,7 @@ Chad Horohoe Chad Horohoe Charles Melbye Chiefwei +Chris Koerner Chris McMahon Chris Steipp Christian Aistleitner @@ -100,6 +101,8 @@ Christian Aistleitner Christian Williams Christian Williams Christian Williams +Christoph Jauera +Christoph Jauera Christopher Johnson church of emacs Cindy Cicalese @@ -115,12 +118,14 @@ Daniel Friesen Daniel Friesen Daniel Kinzler Daniel Kinzler +Daniel Renfro Danny B. Danny B. Danny B. Danny B. Darian Anthony Patrick Darkdragon09 +David Causse David Chan Dereckson Derk-Jan Hartman @@ -134,6 +139,7 @@ Ebrahim Byagowi Ed Sanders Elliott Eggleston Elliott Eggleston +Emad Elwany Emmanuel Engelhart Emufarmers Emufarmers @@ -201,14 +207,18 @@ Jason Richey Jason Richey Jeff Hall Jeff Hall +Jeff Hobson Jeff Janes +Jeremy Baron Jeremy Postlethwaite Jeroen De Dauw Jeroen De Dauw Jesús Martínez Novo Jiabao Jimmy Collins +Joel Sahleen John Du Hart +John Erling Blad Jon Harald Søby Jon Robson Jon Robson @@ -217,6 +227,8 @@ Juliusz Gonera JuneHyeon Bae Jure Kajzer Jure Kajzer +Justin Du +Kai Nissen Karun Dambiec Katie Filbert Katie Filbert @@ -236,6 +248,7 @@ liangent Lisa Ridley Ljudusika Luis Felipe Schenone +Luke Welling Lupo m4tx Madman @@ -261,6 +274,7 @@ Markus Glaser Matt Johnston Matthew Britton Matthew Flaschen +Matthew Walker Matthias Mullie Matthias Mullie Matěj Grabovský @@ -277,15 +291,17 @@ Mormegil MrBlueSky MrBlueSky Mukunda Modell -Mwalker MZMcBride nadeesha Namit +Nathan Larson +Nathan Larson Nathaniel Herman Neil Kandalgaonkar Nemo bis nephele Nick Jenkins +Niharika Kohli Nik Everett Niklas Laxström Niklas Laxström @@ -297,10 +313,12 @@ OverlordQ Owen Davis Owen Davis paladox +Patricio Molina Patrick Reilly Patrick Reilly Patrick Westerhoff Paul Copperman +Peter Coombe Peter Coti Peter Potrowl Petr Kadlec @@ -385,10 +403,10 @@ Stephane Bisson Stephen Liang Steve Sanbeg Steven Roddis +Steven Walling Subramanya Sastry Sucheta Ghoshal Sumit Asthana -Swalling Thalia Chan Thiemo Mättig (WMDE) Thiemo Mättig (WMDE) @@ -406,8 +424,6 @@ Timo Tijhof Timo Tijhof Timo Tijhof Tina Johnson -Tisane -Tjones Tom Maaswinkel Tomasz Finc Tomasz W. Kozlowski @@ -418,9 +434,11 @@ Tpt Trevor Parscal Trevor Parscal Trevor Parscal +Trey Jones Tyler Cipriani Tyler Romeo Umherirrender +Victor Barbu Victor Vasiliev Victor Vasiliev Victor Vasiliev @@ -438,6 +456,7 @@ Yongmin Hong Yuri Astrakhan Yuri Astrakhan Yuri Astrakhan +Yuriy Shnitkovskiy Yusuke Matsubara Yuvi Panda Zak Greant