From 0614442375c0c82175ee9b389a31ee9f2c7f1258 Mon Sep 17 00:00:00 2001
From: David Mehren
Date: Fri, 20 Nov 2020 20:21:57 +0100
Subject: Update .mailmap and AUTHORS

Signed-off-by: David Mehren <git@herrmehren.de>
---
 .mailmap | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 8f14718b..fdb53882 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,7 +4,7 @@ Max Wu <jackymaxj@gmail.com>                 jackycute <jackymaxj@gmail.com>
 Max Wu <jackymaxj@gmail.com>                 Wu, Cheng-Han <jackymaxj@gmail.com>
 Max Wu <jackymaxj@gmail.com>                 jackycute <jacky_cute0808@hotmail.com>
 
-Sheogorath <sheogorath@shivering-isles.com>  Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com>
+Christoph (Sheogorath) Kern <sheogorath@shivering-isles.com> Sheogorath <sheogorath@shivering-isles.com>
 
 Raccoon <raccoon@hackmd.io>                  Raccoon Li <a60814billy@gmail.com>
 Raccoon <raccoon@hackmd.io>                  Raccoon <a60814billy@gmail.com>
@@ -12,3 +12,19 @@ Raccoon <raccoon@hackmd.io>                  Raccoon <a60814billy@gmail.com>
 Peter Dave Hello <hsu@peterdavehello.org>    Peter Dave Hello <PeterDaveHello@users.noreply.github.com>
 
 Claudius Coenen <github@amenthes.de>         Claudius Coenen <opensource@amenthes.de>
+Claudius Coenen <github@amenthes.de>         Claudius <opensource@amenthes.de>
+
+David Mehren <git@herrmehren.de>             David Mehren <dmehren1@gmail.com>
+David Mehren <git@herrmehren.de>             David Mehren <davidmehren@users.noreply.github.com>
+
+mcnesium <git@mcnesium.com>                  mcnesium <mcnesium@users.noreply.github.com>
+
+Sandro Jäckel <sandro.jaeckel@gmail.com>     Sandro <sandro.jaeckel@gmail.com>
+
+Tilman Vatteroth <tilman.vatteroth@tu-dortmund.de> mrdrogdrog <tilman.vatteroth@tu-dortmund.de>
+
+Erik Michelson <github@erik.michelson.eu>    Erik Michelson <erik@liltv.de>
+
+Jonas Zohren <jonas.zohren@tu-dortmund.de>   Jonas Zohren <15788906+jfowl@users.noreply.github.com>
+
+Philip Molares <philip.molares@udo.edu>      Philip Molares <git@molar.es>
-- 
cgit v1.2.3