diff options
author | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
commit | 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b (patch) | |
tree | d9724175476a27a7234140519e035c8d4c79aedc /.mailmap | |
parent | 22f7d4bce1e694b7ac38e62410d76a6d46d96c5d (diff) | |
parent | d58e52b0713648dd30d41b41277854a935d8d15a (diff) | |
download | guix-0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b.tar guix-0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b.tar.gz |
Merge remote-tracking branch core-updates-frozen into core-updates
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> |