diff options
| author | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-02-02 10:52:24 -0500 |
| commit | e8c83d04e176f205b30b3d470f22ee5e1c686331 (patch) | |
| tree | 30a95626ea31414a6319b93f50eea1e69b87a619 /.mailmap | |
| parent | d9b4cbc2a168ca3d248c5abf1f1d14c1808e6a20 (diff) | |
| parent | de643f0c15677665acce73db9c28c5488e623633 (diff) | |
| download | guix-e8c83d04e176f205b30b3d470f22ee5e1c686331.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.mailmap b/.mailmap index a6687ee447..a3ec47ff44 100644 --- a/.mailmap +++ b/.mailmap @@ -40,11 +40,12 @@ Marius Bakke <mbakke@fastmail.com> <m.bakke@warwick.ac.uk> 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@libertad.pw> <ng0@we.make.ritual.n0.is> -ng0 <ng0@libertad.pw> <ngillmann@runbox.com> -ng0 <ng0@libertad.pw> <niasterisk@grrlz.net> -ng0 <ng0@libertad.pw> <ng@niasterisk.space> -ng0 <ng0@libertad.pw> +ng0 <contact.ng0@cryptolab.net> +ng0 <contact.ng0@cryptolab.net> <ng0@we.make.ritual.n0.is> +ng0 <contact.ng0@cryptolab.net> <ngillmann@runbox.com> +ng0 <contact.ng0@cryptolab.net> <niasterisk@grrlz.net> +ng0 <contact.ng0@cryptolab.net> <ng@niasterisk.space> +ng0 <contact.ng0@cryptolab.net> <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> |