diff options
author | Mark H Weaver <mhw@netris.org> | 2017-06-18 02:36:51 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2017-06-18 02:36:51 -0400 |
commit | 9d4385634d098cc0fb35bfe58179f7d855352e39 (patch) | |
tree | 653cfd7a6faecaf42129b1aa47703e7bd01bc471 /.mailmap | |
parent | a6aff3528c32cc921bddd78b254678a1fc121f21 (diff) | |
parent | 96fd87c96bd6987a967575aaa931c5a7b1c84e21 (diff) | |
download | guix-9d4385634d098cc0fb35bfe58179f7d855352e39.tar guix-9d4385634d098cc0fb35bfe58179f7d855352e39.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -42,14 +42,15 @@ 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.pragmatique.xyz> -ng0 <ng0@no-reply.pragmatique.xyz> <ng0@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> +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> 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> |