summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2020-05-27 13:28:04 +0200
committerGitHub <noreply@github.com>2020-05-27 13:28:04 +0200
commitbbbeb6d73791d4faa8a64b239d52f037cf806b08 (patch)
treee65959ae6b2fc5e68e9cdab5ccef3d959fe4b3fc /.mailmap
parentf828dfdbcafc8387afbcce11f2b951beb859d281 (diff)
parent8e66eddfd8a1abfb1c827ce4a9f33d3e4c5cee87 (diff)
downloadhercules-bbbeb6d73791d4faa8a64b239d52f037cf806b08.tar.gz
hercules-bbbeb6d73791d4faa8a64b239d52f037cf806b08.tar.bz2
hercules-bbbeb6d73791d4faa8a64b239d52f037cf806b08.tar.xz
hercules-bbbeb6d73791d4faa8a64b239d52f037cf806b08.zip
Merge pull request #2729 from 4144/authors
Add nicks and emails from all commits into AUTHORS file
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap8
1 files changed, 8 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 4a9b49d2d..111831380 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,11 @@
+# hercules aliases
+
+Jenkijo <jenkijo@hrzn.community> <phongtruongit@gmail.com>
+Kenpachi <Kenpachi.Developer@gmx.de> kenpachi2k11 <Kenpachi.Developer@gmx.de>
+Kenpachi <Kenpachi.Developer@gmx.de> Kenpachi2k13 <3476227+Kenpachi2k13@users.noreply.github.com>
+Kenpachi <Kenpachi.Developer@gmx.de> Kenpachi2k13 <Kenpachi.Developer@gmx.de>
+Kenpachi <Kenpachi.Developer@gmx.de> Kenpachi Developer <Kenpachi.Developer@gmx.de>
+
# SVN -> git mailmap
<kisuka@kisuka.com> <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>