From cf0b1e435b849193720c33d3e78857ccf1837e6d Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 3 May 2018 18:24:46 -0700 Subject: Relicense TikiWiki reader as GPL v2 or above, like rest of pandoc. Author has given permission in an email, 3 May 2018. See #4591. --- COPYRIGHT | 2 +- src/Text/Pandoc/Readers/TikiWiki.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 5c673bf1a..ca59fa401 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -123,7 +123,7 @@ Released under the GNU General Public License version 2 or later. src/Text/Pandoc/Readers/TikiWiki.hs Copyright (C) 2017 Robin Lee Powell -Released under the GNU General Public License version 2. +Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/JATS.hs diff --git a/src/Text/Pandoc/Readers/TikiWiki.hs b/src/Text/Pandoc/Readers/TikiWiki.hs index 9ba47d183..5c7507248 100644 --- a/src/Text/Pandoc/Readers/TikiWiki.hs +++ b/src/Text/Pandoc/Readers/TikiWiki.hs @@ -6,7 +6,7 @@ {- | Module : Text.Pandoc.Readers.TikiWiki Copyright : Copyright (C) 2017 Robin Lee Powell - License : GPLv2 + License : GNU GPL, version 2 or above Maintainer : Robin Lee Powell Stability : alpha -- cgit v1.2.3