]> granicus.if.org Git - apache/commit
merge with trunk r1301894
authorRoy T. Fielding <fielding@apache.org>
Sat, 17 Mar 2012 09:08:44 +0000 (09:08 +0000)
committerRoy T. Fielding <fielding@apache.org>
Sat, 17 Mar 2012 09:08:44 +0000 (09:08 +0000)
commit630f45a87ec3e423e6d195a4a0083afab90768ec
tree0a40f8389960b5035e340b81b89cf6cd671e3621
parentb3e10580bb2b185f421c50dd50ecdb5e127722a4
merge with trunk r1301894

Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301895 13f79535-47bb-0310-9956-ffa450edef68
docs/conf/mime.types