diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-21 23:18:54 +0100 |
| commit | 081850816f98c7f5d815ac7251c69bf2ada50cc0 (patch) | |
| tree | 609b7e9e9c267e8c382bdebf8295b9f45bab6cc4 /.mailmap | |
| parent | 792d526a256773d1abe00b73c2a2131037148139 (diff) | |
| parent | 93f178b5a84a8cc5a0c552290191efd2310588b5 (diff) | |
| download | guix-081850816f98c7f5d815ac7251c69bf2ada50cc0.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/.mailmap b/.mailmap index 981decdeef..7de5313923 100644 --- a/.mailmap +++ b/.mailmap @@ -43,20 +43,20 @@ Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> Mathieu Othacehe <mathieu.othacehe@parrot.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> -Nils Gillmann <ng0@n0.is> <ng0@no-reply.infotropique.org> -Nils Gillmann <ng0@n0.is> <ng0@no-reply.pragmatique.xyz> -Nils Gillmann <ng0@n0.is> <ng0@pragmatique.xyz> -Nils Gillmann <ng0@n0.is> <contact.ng0@cryptolab.net> -Nils Gillmann <ng0@n0.is> <ng0@we.make.ritual.n0.is> -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> +ng0 <ng0@n0.is> Nils Gillmann <ng0@n0.is> +ng0 <ng0@n0.is> Nils Gillmann <gillmann@infotropique.org> +ng0 <ng0@n0.is> ng0 <ng0@crash.cx> +ng0 <ng0@n0.is> ng0 <ng0@crash.cx> +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> Pierre Neidhardt <mail@ambrevar.xyz> Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> |