diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-03 19:41:05 +0100 |
commit | 982eff9e841f3539e4ecf93669435a290bfde571 (patch) | |
tree | b1e3f6fc85c6c35c264f091eb2fc5cff8514c230 /.mailmap | |
parent | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (diff) | |
parent | 7158fe4ded47a599ceb8d556132ba83fcc686962 (diff) | |
download | guix-982eff9e841f3539e4ecf93669435a290bfde571.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
-rw-r--r-- | .mailmap | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index af3f0e9508..daab7c91a1 100644 --- a/.mailmap +++ b/.mailmap @@ -13,6 +13,7 @@ Andy Wingo <wingo@igalia.com> <wingo@pobox.com> 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> 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> @@ -23,6 +24,7 @@ David Thompson <davet@gnu.org> <dthompson@member.fsf.org> David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com> Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple> Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com> +Eric Bavier <bavier@member.fsf.org> <bavier@posteo.net> Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com> George Clemmer <myglc2@gmail.com> ison <ison@airmail.cc> <ison111@protonmail.com> |