diff options
author | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-08 11:07:02 -0400 |
---|---|---|
committer | Brett Smith <brettcsmith@brettcsmith.org> | 2012-07-08 11:07:02 -0400 |
commit | 81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d (patch) | |
tree | 0361e85a142b3574b0de28f172fdcf57f21bb6ee /mediagoblin/media_types | |
parent | 9c7688667e9a5e96fbf54900976834b4ecf2b033 (diff) | |
parent | a122357ee75d0abf215b552f0923de1fd722f6de (diff) | |
download | mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.tar.lz mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.tar.xz mediagoblin-81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d.zip |
Merge branch 'master' into 201207-testfixes
Diffstat (limited to 'mediagoblin/media_types')
-rw-r--r-- | mediagoblin/media_types/audio/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/media_types/audio/__init__.py b/mediagoblin/media_types/audio/__init__.py index 9b33f9e3..4f3ead60 100644 --- a/mediagoblin/media_types/audio/__init__.py +++ b/mediagoblin/media_types/audio/__init__.py @@ -22,4 +22,4 @@ MEDIA_MANAGER = { 'processor': process_audio, 'sniff_handler': sniff_handler, 'display_template': 'mediagoblin/media_displays/audio.html', - 'accepted_extensions': ['mp3', 'flac', 'ogg', 'wav', 'm4a']} + 'accepted_extensions': ['mp3', 'flac', 'wav', 'm4a']} |