summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-10-28 12:33:38 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-10-28 12:34:24 +0100
commit13b4d44860ebdfa3b5b2a0cb338013aff86ccdf8 (patch)
tree32ef80656f0c910a7eb86b48d726bc204e8ce008
parent54b45dfb5384e5db24932b0d183b226c990d23ed (diff)
[1.5.x] Reverted unintentional change in aff9b2f.
Backport of 785bf0d from master.
-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 27bb072114..f1cbb22880 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -34,7 +34,7 @@ INTERNAL_IPS = ()
# systems may support all possibilities). When USE_TZ is True, this is
# interpreted as the default user time zone.
TIME_ZONE = 'America/Chicago'
-TIME_ZONE = 'Europe/Paris'
+
# If you set this to True, Django will use timezone-aware datetimes.
USE_TZ = False