1 files changed, 6 insertions, 1 deletions
diff --git a/module/web/settings.py b/module/web/settings.py
index 760ace9f4..e135825d1 100644
--- a/module/web/settings.py
+++ b/module/web/settings.py
@@ -6,6 +6,7 @@ TEMPLATE_DEBUG = DEBUG
 
 import os.path
 import sys
+import django
 
 SERVER_VERSION = "0.3.2"
 
@@ -75,7 +76,11 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'Europe'
+if django.VERSION[0] > 1 or django.VERSION[1] > 1:
+    zone = None
+else:
+    zone = 'Europe'
+TIME_ZONE = zone
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html