diff options
author | Mark H Weaver <mhw@netris.org> | 2018-03-20 14:22:06 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-03-20 14:22:06 -0400 |
commit | ac21be848ac420d2106d4441e9e48ea6a60c5c8c (patch) | |
tree | bbd383d300a2142389dfcd90263d8f99adbd0d7a /doc/guix.texi | |
parent | d3da21d222665de607f65d475dff1d2d55247753 (diff) | |
parent | 4a78fd4617908546be15d2c101f5cab512c71f8e (diff) | |
download | guix-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar guix-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 4de8e9cb5a..7219ef4d0f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26,7 +26,7 @@ Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* -Copyright @copyright{} 2016, 2017 ng0@* +Copyright @copyright{} 2016, 2017 Nils Gillmann@* Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* |