summaryrefslogtreecommitdiff
path: root/django/conf/project_template/settings.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-02-26 15:33:27 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-02-26 15:33:27 +0000
commit46cc7021a8ab60190d81e9d7e039cd84efbafb23 (patch)
tree5f809c291af834fb5a2cd2d122ca849c26062ae3 /django/conf/project_template/settings.py
parent0ff624a3cb075800e6c84cf80e36b085e23cf270 (diff)
Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/project_template/settings.py')
-rw-r--r--django/conf/project_template/settings.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py
index 361a36b36b..ee08e9712b 100644
--- a/django/conf/project_template/settings.py
+++ b/django/conf/project_template/settings.py
@@ -23,6 +23,8 @@ DATABASES = {
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
+# On Unix systems, a value of None will cause Django to use the same
+# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'America/Chicago'