aboutsummaryrefslogtreecommitdiff
path: root/src/Text/Pandoc
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-04-29 16:17:40 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-04-29 16:17:40 -0700
commit4b2f469994143728c2ffe22aa37370b90a054e15 (patch)
tree7ad67e5f576655e2be2d8713d96c4b990bf10596 /src/Text/Pandoc
parent55b7afc674d36a26e2ce4eb5f72d22487807a614 (diff)
parent7031748a434c0624ca2139e91da0ea8a5559169c (diff)
downloadpandoc-4b2f469994143728c2ffe22aa37370b90a054e15.tar.gz
Merge pull request #2123 from hellofloat/master
Added woff2 to MIME types
Diffstat (limited to 'src/Text/Pandoc')
-rw-r--r--src/Text/Pandoc/MIME.hs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Text/Pandoc/MIME.hs b/src/Text/Pandoc/MIME.hs
index 34f0d6937..27f7e3414 100644
--- a/src/Text/Pandoc/MIME.hs
+++ b/src/Text/Pandoc/MIME.hs
@@ -497,6 +497,7 @@ mimeTypesList = -- List borrowed from happstack-server.
,("wmx","video/x-ms-wmx")
,("wmz","application/x-ms-wmz")
,("woff","application/x-font-woff")
+ ,("woff2","application/x-font-woff2")
,("wp5","application/wordperfect5.1")
,("wpd","application/wordperfect")
,("wrl","model/vrml")