diff options
author | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-04-22 18:27:12 -0400 |
commit | 1524851f58d8d69f6c6e1c6406cf174083bbe82d (patch) | |
tree | d7c63b716501e4423e9f7173790a8cc4c3962935 /.mailmap | |
parent | 0802f3a034815576bf0e28c59c968400566b418b (diff) | |
parent | ed9fb46b16cf7632e6df15c52c7183807fe5d1f9 (diff) | |
download | patches-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar patches-1524851f58d8d69f6c6e1c6406cf174083bbe82d.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -40,12 +40,13 @@ 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> 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> |