summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2016-07-04 13:54:11 +0200
committerGitHub <noreply@github.com>2016-07-04 13:54:11 +0200
commitbe847398b4eca9b6ee1fccad9efa62a67b8f4429 (patch)
tree084051ee4d6399e6d29b589ef05b52b42bdfd222
parent77082c20a77c7202129600efbd74b8871b731ff5 (diff)
parentee790ec6acf318d17558d103502c950d4e170149 (diff)
downloadnextcloud-server-be847398b4eca9b6ee1fccad9efa62a67b8f4429.tar.gz
nextcloud-server-be847398b4eca9b6ee1fccad9efa62a67b8f4429.zip
Merge pull request #296 from ayamshanov/add_fb2_mimetype
Add mimetype for fb2-extension
-rw-r--r--resources/config/mimetypealiases.dist.json1
-rw-r--r--resources/config/mimetypemapping.dist.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 2a1e8485780..8445198e32c 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -61,6 +61,7 @@
"application/x-compressed": "package/x-generic",
"application/x-dcraw": "image",
"application/x-deb": "package/x-generic",
+ "application/x-fictionbook+xml": "text",
"application/x-font": "image",
"application/x-gimp": "image",
"application/x-gzip": "package/x-generic",
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 16f5027d626..00c4e8bf12f 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -52,6 +52,7 @@
"eps": ["application/postscript"],
"erf": ["image/x-dcraw"],
"exe": ["application/x-ms-dos-executable"],
+ "fb2": ["application/x-fictionbook+xml", "text/plain"],
"flac": ["audio/flac"],
"flv": ["video/x-flv"],
"gif": ["image/gif"],