From: Aditi <aditi.iitr@gmail.com>
Date: Wed, 28 Aug 2013 17:58:09 +0000 (+0530)
Subject: Pull changes and resolve merge conflict.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=922599990d07d4ab1eb34cd57d59a4ced6882884;p=mediagoblin.git

Pull changes and resolve merge conflict.
---

922599990d07d4ab1eb34cd57d59a4ced6882884
diff --cc mediagoblin/media_types/image/__init__.py
index 380304e6,06e0f08f..f5b49f01
--- a/mediagoblin/media_types/image/__init__.py
+++ b/mediagoblin/media_types/image/__init__.py
@@@ -27,11 -27,7 +27,9 @@@ _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"
      display_template = "mediagoblin/media_displays/image.html"