diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-02-13 13:17:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-02-13 13:17:15 -0500 |
| commit | 288b8fd5e97c32d44a49612dbeef854c05ebc373 (patch) | |
| tree | 8a5021c9af2497c560ff94d37b8217d6187d8dbd /.mailmap | |
| parent | a7fb29866520d5661e0ac8e47957c91a2a43e11e (diff) | |
| parent | acff6aa00473befac75f8120fc4299f4f265c258 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -42,17 +42,18 @@ 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@n0.is> -ng0 <ng0@n0.is> <ng0@infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.infotropique.org> -ng0 <ng0@n0.is> <ng0@no-reply.pragmatique.xyz> -ng0 <ng0@n0.is> <ng0@pragmatique.xyz> -ng0 <ng0@n0.is> <contact.ng0@cryptolab.net> -ng0 <ng0@n0.is> <ng0@we.make.ritual.n0.is> -ng0 <ng0@n0.is> <ngillmann@runbox.com> -ng0 <ng0@n0.is> <niasterisk@grrlz.net> -ng0 <ng0@n0.is> <ng@niasterisk.space> -ng0 <ng0@n0.is> <ng0@libertad.pw> +ng0 <ng0@crash.cx> +ng0 <ng0@crash.cx> ng0 <ng0@n0.is> +ng0 <ng0@crash.cx> <ng0@infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.infotropique.org> +ng0 <ng0@crash.cx> <ng0@no-reply.pragmatique.xyz> +ng0 <ng0@crash.cx> <ng0@pragmatique.xyz> +ng0 <ng0@crash.cx> <contact.ng0@cryptolab.net> +ng0 <ng0@crash.cx> <ng0@we.make.ritual.n0.is> +ng0 <ng0@crash.cx> <ngillmann@runbox.com> +ng0 <ng0@crash.cx> <niasterisk@grrlz.net> +ng0 <ng0@crash.cx> <ng@niasterisk.space> +ng0 <ng0@crash.cx> <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> |