Merge pull request #476 from romainneutron/fix_07-10

[3.8] Multiple fixes
This commit is contained in:
Romain Neutron
2013-07-10 09:19:48 -07:00
21 changed files with 161 additions and 80 deletions

View File

@@ -83,11 +83,10 @@ border-manager:
mediatypes: [Audio, Document, Flash, Image, Video]
authentication:
auto-create:
enabled: false
templates: { }
captcha:
enabled: true
trials-before-failure: 9
trials-before-display: 9
providers:
facebook:
enabled: false