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/markup.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/markup.scm')
-rw-r--r-- | gnu/packages/markup.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 9db548fdd2..fc8e2ceaa7 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 ng0 <ng0@infotropique.org> +;;; Copyright © 2017 Nils Gillmann <ng0@n0.is> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. |