diff options
author | Mark H Weaver <mhw@netris.org> | 2017-08-15 03:10:14 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-08-15 03:10:14 -0400 |
commit | 09ec5a0f0c40afde63975af9e9203884dad86ea7 (patch) | |
tree | c85530d4a7ed433779d787a0c452ed0d4b7f0f0a /.mailmap | |
parent | 3785e42e5219a86d9d8a5208ff18e97e0cbcbe78 (diff) | |
parent | 2d430f29231d0d817459d86e0fe15089372e9547 (diff) | |
download | guix-09ec5a0f0c40afde63975af9e9203884dad86ea7.tar guix-09ec5a0f0c40afde63975af9e9203884dad86ea7.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -42,15 +42,16 @@ 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 <ng0@no-reply.infotropique.org> -ng0 <ng0@no-reply.infotropique.org> <ng0@no-reply.pragmatique.xyz> -ng0 <ng0@no-reply.infotropique.org> <ng0@pragmatique.xyz> -ng0 <ng0@no-reply.infotropique.org> <contact.ng0@cryptolab.net> -ng0 <ng0@no-reply.infotropique.org> <ng0@we.make.ritual.n0.is> -ng0 <ng0@no-reply.infotropique.org> <ngillmann@runbox.com> -ng0 <ng0@no-reply.infotropique.org> <niasterisk@grrlz.net> -ng0 <ng0@no-reply.infotropique.org> <ng@niasterisk.space> -ng0 <ng0@no-reply.infotropique.org> <ng0@libertad.pw> +ng0 <ng0@infotropique.org> +ng0 <ng0@infotropique.org> <ng0@no-reply.infotropique.org> +ng0 <ng0@infotropique.org> <ng0@no-reply.pragmatique.xyz> +ng0 <ng0@infotropique.org> <ng0@pragmatique.xyz> +ng0 <ng0@infotropique.org> <contact.ng0@cryptolab.net> +ng0 <ng0@infotropique.org> <ng0@we.make.ritual.n0.is> +ng0 <ng0@infotropique.org> <ngillmann@runbox.com> +ng0 <ng0@infotropique.org> <niasterisk@grrlz.net> +ng0 <ng0@infotropique.org> <ng@niasterisk.space> +ng0 <ng0@infotropique.org> <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> |