X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=blobdiff_plain;f=.mailmap;h=dd968e8d08fca8a7581cd4fef0a447da26f37ddf;hb=5433c9357df94b11d79fd1c2f0cf9261dbb84e2a;hp=6d9f8e8bcb782c1910b1dc5401862f3e36a1efcf;hpb=5111bd2def4e63ecc8a2acbf468e5c39029f9efd;p=lhc%2Fweb%2Fwiklou.git diff --git a/.mailmap b/.mailmap index 6d9f8e8bcb..dd968e8d08 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