Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0

This commit is contained in:
Tatiana Lopaeva 2021-11-18 10:02:47 +03:00
commit 8ff0bbba61
2 changed files with 3 additions and 1 deletions

View File

@ -139,7 +139,7 @@ class DocserviceStore {
{ ".doc": [".docx", ".odt", ".pdf", ".rtf", ".txt"] },
{ ".docm": [".docx", ".odt", ".pdf", ".rtf", ".txt"] },
{ ".doct": [".docx"] },
{ ".docx": [".odt", ".pdf", ".rtf", ".txt"] },
{ ".docx": [".docxf", ".odt", ".pdf", ".rtf", ".txt"] },
{ ".dot": [".docx", ".odt", ".pdf", ".rtf", ".txt"] },
{ ".dotm": [".docx", ".odt", ".pdf", ".rtf", ".txt"] },
{ ".dotx": [".docx", ".odt", ".pdf", ".rtf", ".txt"] },

View File

@ -118,6 +118,8 @@ class IconFormatsStore {
".doct",
".docy",
".gdoc",
".docxf",
".oform",
];
presentation = [
".pps",