summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 6 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 133bc8373..e06a7afcc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,4 +3,9 @@
<cosenal@gmail.com> <acosenti@malutchosky.(none)>
David-Development <david-dev@live.de>
<hey@morrisjobke.de> <morris.jobke@gmail.com>
-Alessandro Cosentino <cosenal@gmail.com>
+Alessandro Cosentino <cosenal@gmail.com> Alessandro <cosenal@gmail.com>
+Jenkins for ownCloud <owncloud-bot@tmit.eu> Jenkins for ownCloud <thomas.mueller@tmit.eu>
+Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
+bastei <bastei@users.noreply.github.com> bastei <none>
+Konrad Graefe <konradgraefe@aol.com> kgraefe <konradgraefe@aol.com>
+<lukas@owncloud.com> <lukas@statuscode.ch>