diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
commit | 4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch) | |
tree | 17bac0c3211a872d3a0292cae20347718ecdd5f7 /.mailmap | |
parent | 9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff) | |
parent | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff) | |
download | patches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar patches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar.gz |
Merge branch 'master' into staging
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> |