aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2018-04-25 17:03:36 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2018-04-25 17:03:36 -0700
commit28f7d8ab4dea087a30d1bea2adfe6999c27d07bc (patch)
tree8c369d45aaee3424a7489f428995ed0355ce931b /COPYRIGHT
parent97916f0881465312bdb53793ba36df151710b47c (diff)
downloadpandoc-28f7d8ab4dea087a30d1bea2adfe6999c27d07bc.tar.gz
Added license of TikiWiki reader to COPYRIGHT.
Closes #4591. Ideally the author will relicense as GPL v2 or later.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT6
1 files changed, 6 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 0477bb450..d2115c59b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -120,6 +120,12 @@ Copyright (C) 2010-2018 Paul Rivier and John MacFarlane
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.
+
+----------------------------------------------------------------------
src/Text/Pandoc/Readers/JATS.hs
Copyright (C) 2017-2018 Hamish Mackenzie