diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 11:04:44 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 14:19:08 +0200 |
| commit | d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a (patch) | |
| tree | 2732020de20a38c09b66a60b0cb36022799f7c2e /.mailmap | |
| parent | b949f34f31a045eb0fb242b81a223178fb6994d3 (diff) | |
| parent | 49922efb11da0f0e9d4f5979d081de5ea8c99d25 (diff) | |
| download | guix-patches-d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a.tar guix-patches-d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a.tar.gz | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -15,6 +15,7 @@ Ben Woodcroft <donttrustben@gmail.com> Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au> Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com> Brett Gilio <brettg@gnu.org> <brettg@posteo.net> +Christine Lemmer-Webber <cwebber@dustycloud.org> Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com> Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com> Daniel Pimentel <d4n1@d4n1.org> <d4n1@member.fsf.org> @@ -40,9 +41,13 @@ Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com> Joshua Grant <tadni@riseup.net> <youlysses@riseup.net> Kei Kebreau <kkebreau@posteo.net> Leo Famulari <leo@famulari.name> <lfamular@gmail.com> +Liliana Prikler <liliana.prikler@gmail.com> Leo Prikler <leo.prikler@student.tugraz.at> Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr> Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com> -Marius Bakke <mbakke@fastmail.com> <m.bakke@warwick.ac.uk> +Marius Bakke <marius@gnu.org> <mbakke@fastmail.com> +Marius Bakke <marius@gnu.org> <m.bakke@warwick.ac.uk> +Marius Bakke <marius@gnu.org> <marius.bakke@usit.uio.no> +Marius Bakke <marius@gnu.org> <mbakke@berlin.guixsd.org> Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org> Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org> Mathieu Othacehe <m.othacehe@gmail.com> |