Merge remote-tracking branch 'refs/remotes/merge-requests/47'

2013-05-10 11:23:36 -05:00
parent e5cdd74294 42ce372e38
commit fcfcd1f8a3
2 changed files with 15 additions and 1 deletions
--- a/mediagoblin.ini
+++ b/mediagoblin.ini
@@ -20,6 +20,8 @@ email_debug_mode = true
 allow_registration = true

 ## Uncomment this to turn on video or enable other media types
+## You may have to install dependencies, and will have to run ./bin/dbupdate
+## See http://docs.mediagoblin.org/siteadmin/media-types.html for details.
 # media_types = mediagoblin.media_types.image, mediagoblin.media_types.video

 ## Uncomment this to put some user-overriding templates here