diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-12 16:24:36 -0500 |
| commit | 5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca (patch) | |
| tree | 7ffa78df3fbac665d32238d151fe76d07f4d995e /mediagoblin/config_spec.ini | |
| parent | ac08a9acaffbafdcb99506495a192b1eaa508544 (diff) | |
| parent | 4259ad5bf1680896090290e7327b49a053a8447b (diff) | |
| download | mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.lz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.xz mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.zip | |
Merge branch 'rodney757-media_plugins'
Conflicts:
mediagoblin.ini
mediagoblin/tests/test_mgoblin_app.ini
Diffstat (limited to 'mediagoblin/config_spec.ini')
| -rw-r--r-- | mediagoblin/config_spec.ini | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 12af2f57..d2ada163 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -5,9 +5,6 @@ html_title = string(default="GNU MediaGoblin") # link to source for this MediaGoblin site source_link = string(default="https://gitorious.org/mediagoblin/mediagoblin") -# Enabled media types -media_types = string_list(default=list("mediagoblin.media_types.image")) - # database stuff sql_engine = string(default="sqlite:///%(here)s/mediagoblin.db") |