diff options
author | Leo Famulari <leo@famulari.name> | 2016-10-05 19:15:25 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-10-05 19:15:25 -0400 |
commit | b19c7989b770f47011cd531a13c89002374dc3e0 (patch) | |
tree | ca0dccd3a677d4ac5237de87c9f78c31dbdaf148 /.mailmap | |
parent | 6524c1cfcf6088c5574e6ff21f540dfb22f944bf (diff) | |
parent | 145947608905d36f31227e87bebd7ed3a922e910 (diff) | |
download | guix-b19c7989b770f47011cd531a13c89002374dc3e0.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap index 2af7760b16..4f756eca31 100644 --- a/.mailmap +++ b/.mailmap @@ -30,9 +30,10 @@ Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr> Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> -ng0 <ng0@we.make.ritual.n0.is> <niasterisk@grrlz.net> -ng0 <ng0@we.make.ritual.n0.is> <ng@niasterisk.space> -ng0 <ng0@we.make.ritual.n0.is> <ng0@libertad.pw> +ng0 <ngillmann@runbox.com> <ng0@we.make.ritual.n0.is> +ng0 <ngillmann@runbox.com> <niasterisk@grrlz.net> +ng0 <ngillmann@runbox.com> <ng@niasterisk.space> +ng0 <ngillmann@runbox.com> <ng0@libertad.pw> Pjotr Prins <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl> Raimon Grau <raimonster@gmail.com> <raimon@3scale.net> |