diff options
| author | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-09-17 01:25:52 +0200 |
| commit | 5c3cb22c9b2810669999e044b2de5e9331011a83 (patch) | |
| tree | 3276e19cc1a0af3cece6ce4f2bfa930901888bb4 /THANKS | |
| parent | c896287ce5eff968a0b323f3a069653a64b96b4c (diff) | |
| parent | 2a054d29dcfd4b68ed3914886b637f93ac7a0a72 (diff) | |
| download | guix-5c3cb22c9b2810669999e044b2de5e9331011a83.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/bioinformatics.scm gnu/packages/chez.scm gnu/packages/docbook.scm gnu/packages/ebook.scm gnu/packages/gnome.scm gnu/packages/linux.scm gnu/packages/networking.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/tex.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/dune.scm guix/build-system/go.scm guix/build-system/linux-module.scm guix/packages.scm
Diffstat (limited to 'THANKS')
| -rw-r--r-- | THANKS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/THANKS b/THANKS index af7afd3576..26476ab85a 100644 --- a/THANKS +++ b/THANKS @@ -43,7 +43,7 @@ infrastructure help: Alen Skondro <askondro@gmail.com> Jan Synáček <jan.synacek@gmail.com> Matthias Wachs <wachs@net.in.tum.de> -Christopher Allan Webber <cwebber@dustycloud.org> + Christine Lemmer-Webber <cwebber@dustycloud.org> Philip Woods <elzairthesorcerer@gmail.com> GNU Guix also includes non-software works. Thanks to the following |