Pull changes and resolve merge conflict.

[mediagoblin.git] / mediagoblin / media_types / image / __init__.py

diff --git a/mediagoblin/media_types/image/__init__.py b/mediagoblin/media_types/image/__init__.py
index 06e0f08f888dd0bfab895a8101cae0bb001b4557..f5b49f018ee82096390cd629b43776d666a48c0a 100644 (file)
--- a/mediagoblin/media_types/image/__init__.py
+++ b/mediagoblin/media_types/image/__init__.py
@@ -27,6 +27,8 @@ _log = logging.getLogger(__name__)
 ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"]
 MEDIA_TYPE = 'mediagoblin.media_types.image'
 
+def setup_plugin():
+    config = pluginapi.get_config(MEDIA_TYPE)
 
 class ImageMediaManager(MediaManagerBase):
     human_readable = "Image"