Merge remote-tracking branch 'remotes/origin/master' into feature/v8.0

# Conflicts:
#	CHANGELOG.md

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Change Log
 
+##
+- fb2 additional mime
 - pdf as documentType in editor
 
 ## 1.1.0

README.md

@@ -5,8 +5,10 @@ This repository contains the list of file formats (electronic documents, forms,
 The repository is used in:
 * [Document Server integration example](https://github.com/ONLYOFFICE/document-server-integration)
 * [ONLYOFFICE Docs Integration SDK](https://github.com/ONLYOFFICE/docs-integration-sdk-java)
+* [Nextcloud ONLYOFFICE integration app](https://github.com/ONLYOFFICE/onlyoffice-nextcloud)
 * [Nuxeo ONLYOFFICE integration plugin](https://github.com/ONLYOFFICE/onlyoffice-nuxeo)
 * [ONLYOFFICE integration app for Confluence Cloud](https://github.com/ONLYOFFICE/onlyoffice-confluence-cloud)
+* [ownCloud ONLYOFFICE integration app](https://github.com/ONLYOFFICE/onlyoffice-owncloud)
 * [Redmine ONLYOFFICE Integration Plugin](https://github.com/ONLYOFFICE/onlyoffice-redmine)
 * [WordPress ONLYOFFICE integration plugin](https://github.com/ONLYOFFICE/onlyoffice-wordpress)
 

onlyoffice-docs-formats.json

@@ -24,7 +24,7 @@
         "name": "docxf",
         "type": "word",
         "actions": ["view", "edit"],
-        "convert": ["docx", "bmp", "docm", "dotm", "dotx", "epub", "fb2", "gif", "html", "jpg", "odt", "oform", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
+        "convert": ["docx", "bmp", "docm", "dotm", "dotx", "epub", "fb2", "gif", "html", "jpg", "odt", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
         "mime": ["application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf"]
     },
     {
@@ -60,7 +60,7 @@
         "type": "word",
         "actions": ["view", "lossy-edit", "auto-convert"],
         "convert": ["docx", "docxf", "bmp", "docm", "dotm", "dotx", "epub", "gif", "html", "jpg", "odt", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
-        "mime": ["text/fb2+xml"]
+        "mime": ["text/fb2+xml", "application/x-fictionbook+xml"]
     },
     {
         "name": "fodt",
@@ -432,5 +432,12 @@
         "actions": [],
         "convert": [],
         "mime": ["image/png"]
+    },
+    {
+        "name": "zip",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["application/zip"]
     }
 ]