diff options
author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:34:46 +0200 |
commit | aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86 (patch) | |
tree | 856094a6541a72b70d471ed5265d6e940cb11e55 /.mailmap | |
parent | 8ab211dbdb7df000a64aceadfe7b53488819d245 (diff) | |
parent | b4f04e0efff1fb6112b84dc6d36ea46215c336b2 (diff) | |
download | guix-aa13c5657d4f8b5dd52beda88a9a8ccc59ebca86.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index 95e6d3ab76..146e65184a 100644 --- a/.mailmap +++ b/.mailmap @@ -47,6 +47,7 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> Mathieu Othacehe <mathieu.othacehe@parrot.com> +Mathieu Othacehe <othacehe@gnu.org> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> nikita <nikita@n0.is> nikita <nikita@n0.is> ng0 <ng0@n0.is> |