diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2017-05-24 12:05:47 +0200 |
| commit | d1a914082b7e53636f9801769ef96218b2125c4b (patch) | |
| tree | 998805fc59fe0b1bb105b24a6a79fff646257d96 /.mailmap | |
| parent | 657fb6c947d94cf946f29cd24e88bd080c01ff0a (diff) | |
| parent | ae548434337cddf9677a4cd52b9370810b2cc9b6 (diff) | |
| download | guix-d1a914082b7e53636f9801769ef96218b2125c4b.tar guix-d1a914082b7e53636f9801769ef96218b2125c4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -1,6 +1,7 @@ # This list is used to avoid multiple name/email instances of the same # contributors reported by "git log" and "git shortlog" commands. +Adriano Peluso <catonano@gmail.com> Al McElrath <hello@yrns.org> <hello@atonesir.com> Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com> Alexander I. Grafov <grafov@gmail.com> @@ -39,13 +40,15 @@ Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com> 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> +Mathieu Othacehe <m.othacehe@gmail.com> Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com> -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> +ng0 <ng0@no-reply.pragmatique.xyz> +ng0 <ng0@no-reply.pragmatique.xyz> <contact.ng0@cryptolab.net> +ng0 <ng0@no-reply.pragmatique.xyz> <ng0@we.make.ritual.n0.is> +ng0 <ng0@no-reply.pragmatique.xyz> <ngillmann@runbox.com> +ng0 <ng0@no-reply.pragmatique.xyz> <niasterisk@grrlz.net> +ng0 <ng0@no-reply.pragmatique.xyz> <ng@niasterisk.space> +ng0 <ng0@no-reply.pragmatique.xyz> <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> |