diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2011-08-20 22:16:49 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2011-08-20 22:16:49 (GMT) |
| commit | a9931888edcac8bbaaee813fd8b9cfa02dcb1f4f (patch) | |
| tree | 5b213748a6a727b61ee0e07cf8a28b81a20bcbb3 | |
| parent | 7209ff2b317bcb66ff7eb6f4554528e901e85a93 (diff) | |
| parent | 83f7d347d53ea395cd354bd790d49533d06ca717 (diff) | |
| download | cpython-a9931888edcac8bbaaee813fd8b9cfa02dcb1f4f.zip cpython-a9931888edcac8bbaaee813fd8b9cfa02dcb1f4f.tar.gz cpython-a9931888edcac8bbaaee813fd8b9cfa02dcb1f4f.tar.bz2 | |
#5301: merge with 3.2
| -rw-r--r-- | Lib/mimetypes.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/mimetypes.py b/Lib/mimetypes.py index 2ef71f9..961e47f 100644 --- a/Lib/mimetypes.py +++ b/Lib/mimetypes.py @@ -425,6 +425,7 @@ def _default_mime_types(): '.hdf' : 'application/x-hdf', '.htm' : 'text/html', '.html' : 'text/html', + '.ico' : 'image/vnd.microsoft.icon', '.ief' : 'image/ief', '.jpe' : 'image/jpeg', '.jpeg' : 'image/jpeg', |