diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-24 19:56:35 +0200 |
| commit | 706ae8e15c8d36b0aee7c19c54c143d3e17f5784 (patch) | |
| tree | e9fe8ebfb1417d30979b5413165599f066a1c504 /.mailmap | |
| parent | 3e95125e9bd0676d4a9add9105217ad3eaef3ff0 (diff) | |
| parent | 8440db459a10daa24282038f35bc0b6771bd51ab (diff) | |
| download | guix-706ae8e15c8d36b0aee7c19c54c143d3e17f5784.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index 4f672f3278..6188162c62 100644 --- a/.mailmap +++ b/.mailmap @@ -43,6 +43,7 @@ Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> Nils Gillmann <ng0@n0.is> ng0 <ng0@n0.is> +Nils Gillmann <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org> Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx> Nils Gillmann <ng0@n0.is> ng0 <ng0@crash.cx> Nils Gillmann <ng0@n0.is> <ng0@infotropique.org> @@ -55,6 +56,7 @@ Nils Gillmann <ng0@n0.is> <ngillmann@runbox.com> Nils Gillmann <ng0@n0.is> <niasterisk@grrlz.net> Nils Gillmann <ng0@n0.is> <ng@niasterisk.space> Nils Gillmann <ng0@n0.is> <ng0@libertad.pw> +Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> 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> |