diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-12-05 23:41:30 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-12-05 23:41:30 +0100 |
| commit | 77181815ae70cf573b6fa390a4400b718835aa8a (patch) | |
| tree | 731ccaaccc7a69ddc90f04bb71a6a39aa5f3be5a /.mailmap | |
| parent | e3f9406b7c4b3b1afe3dd6affb7f7898434d607a (diff) | |
| parent | 35377cfa908340e51fd22af7369aef15499d4a36 (diff) | |
| download | guix-77181815ae70cf573b6fa390a4400b718835aa8a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/.mailmap b/.mailmap index 49c266bf72..e32a3dfb93 100644 --- a/.mailmap +++ b/.mailmap @@ -42,16 +42,17 @@ 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@infotropique.org> -ng0 <ng0@infotropique.org> <ng0@no-reply.infotropique.org> -ng0 <ng0@infotropique.org> <ng0@no-reply.pragmatique.xyz> -ng0 <ng0@infotropique.org> <ng0@pragmatique.xyz> -ng0 <ng0@infotropique.org> <contact.ng0@cryptolab.net> -ng0 <ng0@infotropique.org> <ng0@we.make.ritual.n0.is> -ng0 <ng0@infotropique.org> <ngillmann@runbox.com> -ng0 <ng0@infotropique.org> <niasterisk@grrlz.net> -ng0 <ng0@infotropique.org> <ng@niasterisk.space> -ng0 <ng0@infotropique.org> <ng0@libertad.pw> +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> 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> |