diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
| commit | 7f69459aca16756f35f08049c64a1bd77d23f33e (patch) | |
| tree | 1d267fb62feab89de5d97582672540cbaa37392c /.mailmap | |
| parent | 4a82722a658220ec1e10f9f2d5d77407d38db90e (diff) | |
| parent | b1989c12501e880afab62d3ff961791906fef350 (diff) | |
| download | guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/.mailmap b/.mailmap index e32a3dfb93..84a1c469c3 100644 --- a/.mailmap +++ b/.mailmap @@ -42,17 +42,18 @@ Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> -ng0 <ng0@n0.is> -ng0 <ng0@n0.is> <ng0@infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz> -ng0 <ng0@n0.is> <ng0@pragmatique.xyz> -ng0 <ng0@n0.is> <contact.ng0@cryptolab.net> -ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is> -ng0 <ng0@n0.is> <ngillmann@runbox.com> -ng0 <ng0@n0.is> <niasterisk@grrlz.net> -ng0 <ng0@n0.is> <ng@niasterisk.space> -ng0 <ng0@n0.is> <ng0@libertad.pw> +ng0 <ng0@crash.cx> +ng0 <ng0@crash.cx> ng0 <ng0@n0.is> +ng0 <ng0@crash.cx> <ng0@infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.pragmatique.xyz> +ng0 <ng0@crash.cx> <ng0@pragmatique.xyz> +ng0 <ng0@crash.cx> <contact.ng0@cryptolab.net> +ng0 <ng0@crash.cx> <ng0@we.make.ritual.n0.is> +ng0 <ng0@crash.cx> <ngillmann@runbox.com> +ng0 <ng0@crash.cx> <niasterisk@grrlz.net> +ng0 <ng0@crash.cx> <ng@niasterisk.space> +ng0 <ng0@crash.cx> <ng0@libertad.pw> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@email> |