summaryrefslogtreecommitdiff
path: root/django/conf
diff options
context:
space:
mode:
authorAdrien Lemaire <lemaire.adrien@gmail.com>2012-09-26 14:14:51 +0200
committerClaude Paroz <claude@2xlibre.net>2012-09-26 14:14:51 +0200
commit2c8267bf3db608b99c04ae903c424b60cafaaf93 (patch)
tree4010acc82f31fa252b48a5fcb896a88695823b22 /django/conf
parent70a0de37d132e5f1514fb939875f69649f103124 (diff)
Fixed #17899 -- Rewrote [Ee]-mail to [Ee]mail
Diffstat (limited to 'django/conf')
-rw-r--r--django/conf/global_settings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index 4d5dc49ee0..708e9c9f70 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -144,7 +144,7 @@ DEFAULT_CHARSET = 'utf-8'
# Encoding of files read from disk (template and initial SQL files).
FILE_CHARSET = 'utf-8'
-# E-mail address that error messages come from.
+# Email address that error messages come from.
SERVER_EMAIL = 'root@localhost'
# Whether to send broken-link emails.