diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-11 13:48:42 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-11 13:48:42 -0500 |
| commit | 058226d0d2d877715b263fd441deb01821f1f59a (patch) | |
| tree | c0871be7592fa4e86c6e98a23d1b197560ab56a9 /mediagoblin/config_spec.ini | |
| parent | aac428bac2a4967999e1fad40ca9d3a7c6b71199 (diff) | |
| parent | 2d8ce464de32611a86532313564e2e5ff1e2c0e5 (diff) | |
| download | mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.tar.lz mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.tar.xz mediagoblin-058226d0d2d877715b263fd441deb01821f1f59a.zip | |
Merge remote-tracking branch 'refs/remotes/tryggvib/532-exif-creation-date'
Conflicts:
mediagoblin/config_spec.ini
mediagoblin/templates/mediagoblin/user_pages/media.html
Diffstat (limited to 'mediagoblin/config_spec.ini')
| -rw-r--r-- | mediagoblin/config_spec.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini index 6c00aa58..2af4adb2 100644 --- a/mediagoblin/config_spec.ini +++ b/mediagoblin/config_spec.ini @@ -61,6 +61,7 @@ csrf_cookie_name = string(default='mediagoblin_csrftoken') push_urls = string_list(default=list()) exif_visible = boolean(default=False) +original_date_visible = boolean(default=False) # Theming stuff theme_install_dir = string(default="%(here)s/user_dev/themes/") |