merge notification-config -> trunk, previous commits 695, 751 (email debugging inform...

[osqa.git] / forum / settings / users.py

diff --git a/forum/settings/users.py b/forum/settings/users.py
index 2a7994283c1c6ce0fcc3074222ec9acc7745ae6d..040e8ebcea7241ee7088646ffd2b52a5e33334a2 100644 (file)
--- a/forum/settings/users.py
+++ b/forum/settings/users.py
@@ -30,7 +30,8 @@ required=False,
 
 EMAIL_UNIQUE = Setting('EMAIL_UNIQUE', True, USERS_SET, dict(
 label = _("Force unique email"),
 
 EMAIL_UNIQUE = Setting('EMAIL_UNIQUE', True, USERS_SET, dict(
 label = _("Force unique email"),

-help_text = _("Should each user have an unique email.")))
+help_text = _("Should each user have an unique email."),
+required=False))

 
 REQUIRE_EMAIL_VALIDATION_TO = Setting('REQUIRE_EMAIL_VALIDATION_TO', [], USERS_SET, dict(
 label = _("Require email validation to..."),
 
 REQUIRE_EMAIL_VALIDATION_TO = Setting('REQUIRE_EMAIL_VALIDATION_TO', [], USERS_SET, dict(
 label = _("Require email validation to..."),