diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
| commit | ae0badf5bb791428423a98d4e4e2b8d297a5d4be (patch) | |
| tree | 4282d243db3e90839a5f7d3b5878674ccd0e2e14 /.mailmap | |
| parent | ee401ed9249fbe284ef1b9b437d39207ca88131b (diff) | |
| parent | 927f3655662b41f25225ea03baa3ded687aa7cbb (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -6,7 +6,7 @@ Al McElrath <hello@yrns.org> <hello@atonesir.com> Alex Sassmannshausen <alex@pompo.co> <alex.sassmannshausen@gmail.com> Alexander I. Grafov <grafov@gmail.com> Alírio Eyng <alirioeyng@gmail.com> -Amin Bandali <mab@gnu.org> <bandali@gnu.org> +Amin Bandali <bandali@gnu.org> <mab@gnu.org> Amirouche Boubekki <amirouche@hypermove.net> Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr> Andreas Enge <andreas@enge.fr> <privat@xobs-novena> |