summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorCyberLeo <cyberleo@cyberleo.net>2021-07-22 21:02:46 -0500
committerCyberLeo <cyberleo@cyberleo.net>2021-07-22 21:02:46 -0500
commit59068642667b2748b2f24d18c58b1d2fdfed7619 (patch)
treedeca4d721637676253ed1270f252f8d389286151 /.mailmap
parent4a177049e3d486da3f54d346d63ea80699c08b5b (diff)
parent50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff)
downloadpackages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz
packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2
packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz
packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip
Merge branch 'master' into kpartx
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap5
1 files changed, 5 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index cfb112230..f21e40ed8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,7 @@
A. Wilcox <AWilcox@Wilcox-Tech.com>
Horst G. Burkhardt <mc@680x0.com>
+Mira Ressel <aranea@aixah.de>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <adelie@aerdan.vulpine.house>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman+apkfission@gmail.com>
+Sheila Aman <sheila@vulpine.house> Kiyoshi Aman <kiyoshi.aman@gmail.com>