Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Conflicts: docs/source/siteadmin/media-types.rst
2012-12-20 12:50:43 -08:00
parent 200433dc38 5c99cd01a7
commit 1d0148aef1
157 changed files with 13322 additions and 5674 deletions
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -29,6 +29,9 @@ allow_registration = true
 ## install other themes.
 # theme = airy

+# Should geotagged images be displayed with a map of the location?
+geolocation_map_visible = true
+
 [storage:queuestore]
 base_dir = %(here)s/user_dev/media/queue