Merge branch 'develop'
This commit is contained in:
commit
8d1f7fd26c
|
@ -28,12 +28,9 @@ types {
|
|||
application/xml rss atom xml rdf;
|
||||
application/java-archive jar war ear;
|
||||
application/mac-binhex40 hqx;
|
||||
application/msword doc;
|
||||
application/pdf pdf;
|
||||
application/postscript ps eps ai;
|
||||
application/rtf rtf;
|
||||
application/vnd.ms-excel xls;
|
||||
application/vnd.ms-powerpoint ppt;
|
||||
application/vnd.wap.wmlc wmlc;
|
||||
application/xhtml+xml xhtml;
|
||||
application/vnd.google-earth.kml+xml kml;
|
||||
|
@ -90,4 +87,12 @@ types {
|
|||
application/x-font-ttf ttf ttc;
|
||||
application/x-font-opentype otf;
|
||||
application/x-font-woff woff;
|
||||
|
||||
# Microsoft Office
|
||||
application/msword doc;
|
||||
application/vnd.ms-excel xls;
|
||||
application/vnd.ms-powerpoint ppt;
|
||||
application/vnd.openxmlformats-officedocument.wordprocessingml.document docx;
|
||||
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx;
|
||||
application/vnd.openxmlformats-officedocument.presentationml.presentation pptx;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue