mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -138,6 +138,9 @@
|
||||
<extension>jpeg</extension>
|
||||
<extension>jpe</extension>
|
||||
</mimetype>
|
||||
<mimetype mimetype="image/svg" display="Scalable Vector Graphics Image">
|
||||
<extension>svg</extension>
|
||||
</mimetype>
|
||||
<mimetype mimetype="application/x-javascript" display="Java Script">
|
||||
<extension>js</extension>
|
||||
</mimetype>
|
||||
|
@@ -7,7 +7,7 @@
|
||||
<mime-type>application/pdf</mime-type>
|
||||
<file-extension>pdf</file-extension>
|
||||
<export-filters>
|
||||
<entry><family>Presentation</family><string>impress_pdf_Export</string></entry>
|
||||
<entry><family>Presentation</family><string>impress_pdf_Export</string></entry>
|
||||
<entry><family>Spreadsheet</family><string>calc_pdf_Export</string></entry>
|
||||
<entry><family>Text</family><string>writer_pdf_Export</string></entry>
|
||||
</export-filters>
|
||||
@@ -30,7 +30,7 @@
|
||||
<mime-type>text/html</mime-type>
|
||||
<file-extension>html</file-extension>
|
||||
<export-filters>
|
||||
<entry><family>Presentation</family><string>impress_html_Export</string></entry>
|
||||
<entry><family>Presentation</family><string>impress_html_Export</string></entry>
|
||||
<entry><family>Spreadsheet</family><string>HTML (StarCalc)</string></entry>
|
||||
<entry><family>Text</family><string>HTML (StarWriter)</string></entry>
|
||||
</export-filters>
|
||||
|
Reference in New Issue
Block a user