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 /Makefile.am | |
parent | d3da21d222665de607f65d475dff1d2d55247753 (diff) | |
parent | 4a78fd4617908546be15d2c101f5cab512c71f8e (diff) | |
download | guix-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 6556799e6b..0c653b54e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,7 @@ # Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> # Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org> # Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> -# Copyright © 2018 ng0 <ng0@n0.is> +# Copyright © 2018 Nils Gillmann <ng0@n0.is> # # This file is part of GNU Guix. # |