diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /.mailmap | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
| download | guix-0e47fcced442d8e7c1b05184fdc1c14f10ed04ec.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap index c18f2e08e3..b955a20486 100644 --- a/.mailmap +++ b/.mailmap @@ -24,8 +24,8 @@ David Thompson <davet@gnu.org> <dthompson2@worcester.edu> David Thompson <davet@gnu.org> <dthompson@member.fsf.org> David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com> Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple> -Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com> -Eric Bavier <bavier@member.fsf.org> <bavier@posteo.net> +Eric Bavier <bavier@posteo.net> <ericbavier@gmail.com> +Eric Bavier <bavier@posteo.net> <bavier@member.fsf.org> Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com> George Clemmer <myglc2@gmail.com> ison <ison@airmail.cc> <ison111@protonmail.com> @@ -48,6 +48,7 @@ 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> +Matthew James Kraai <kraai@ftbfs.org> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> nikita <nikita@n0.is> nikita <nikita@n0.is> ng0 <ng0@n0.is> |