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 /gnu/packages/tls.scm | |
parent | d3da21d222665de607f65d475dff1d2d55247753 (diff) | |
parent | 4a78fd4617908546be15d2c101f5cab512c71f8e (diff) | |
download | patches-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar patches-ac21be848ac420d2106d4441e9e48ea6a60c5c8c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/tls.scm')
-rw-r--r-- | gnu/packages/tls.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a33c1a5235..bb59ff2432 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> +;;; Copyright © 2016, 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> |