diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
| commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
| tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /.mailmap | |
| parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
| parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
| download | guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap index 9c10b84684..8ff87ed24d 100644 --- a/.mailmap +++ b/.mailmap @@ -33,7 +33,7 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net> Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io> Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com> Joshua Grant <tadni@riseup.net> <youlysses@riseup.net> -Kei Kebreau <kei@openmailbox.org> +Kei Kebreau <kei@openmailbox.org> <kkebreau@posteo.net> Leo Famulari <leo@famulari.name> <lfamular@gmail.com> Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr> Marek Benc <dusxmt@gmx.com> <merkur32@gmail.com> |