diff --git a/VERSION b/VERSION index 7411dbb2..e4bd7900 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.04.06.12.11.51 +Version 2.4.6-stable+timestamp.2013.04.06.12.22.00 diff --git a/gluon/contenttype.py b/gluon/contenttype.py index 132fc9b2..dbdee3e6 100644 --- a/gluon/contenttype.py +++ b/gluon/contenttype.py @@ -446,7 +446,7 @@ CONTENT_TYPE = { '.oga': 'audio/x-speex+ogg', '.ogg': 'video/x-theora+ogg', '.ogm': 'video/x-ogm+ogg', - '.ogv': 'video/x-theora+ogg', + '.ogv': 'video/ogg', '.ogx': 'application/ogg', '.old': 'application/x-trash', '.oleo': 'application/x-oleo',