diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-28 01:22:24 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-28 01:22:24 +0200 |
| commit | 61fca0fd22b81bcc0201a336a02cac74b42c6a44 (patch) | |
| tree | 67cca9c72282f24b9ceb0b1706c314537e8c37ea /.mailmap | |
| parent | 57dac1ee935edfab91e9b182c1f7c9ddae794656 (diff) | |
| parent | 526ce419303ac511be8d51b41471022bed472e6b (diff) | |
| download | guix-61fca0fd22b81bcc0201a336a02cac74b42c6a44.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index 6188162c62..620f055638 100644 --- a/.mailmap +++ b/.mailmap @@ -56,6 +56,7 @@ Nils Gillmann <ng0@n0.is> <ngillmann@runbox.com> Nils Gillmann <ng0@n0.is> <niasterisk@grrlz.net> Nils Gillmann <ng0@n0.is> <ng@niasterisk.space> Nils Gillmann <ng0@n0.is> <ng0@libertad.pw> +Pierre Neidhardt <mail@ambrevar.xyz> Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public01@thebird.nl> Pjotr Prins <pjotr.guix@thebird.nl> <pjotr.public12@thebird.nl> |