Permalink
Browse files

Merge branch 'develop' into patchReleases

  • Loading branch information...
2 parents f57d177 + 5313ec7 commit b7e212ddf934b4accba9d704b056f3b784bf6b2e Mike Bardzinski committed Sep 19, 2012
Showing with 10 additions and 0 deletions.
  1. +10 −0 types/node.types
View
@@ -1,3 +1,13 @@
+# What: rtf
+# Why: To be consistent with mime-magic and MacOS & RHEL file(1) reported mime-types
+# Added by: mab-netdev
+text/rtf rtf
+
+# What: bmp
+# Why: To be consistent with mime-magic and MacOS & RHEL file(1) reported mime-types
+# Added by: mab-netdev
+image/x-ms-bmp bmp
+
# What: WebVTT
# Why: To allow formats intended for marking up external text track resources.
# http://dev.w3.org/html5/webvtt/

0 comments on commit b7e212d

Please sign in to comment.