Merge branch 'master' into funding

[wolnelektury.git] / wolnelektury / settings / basic.py

diff --git a/wolnelektury/settings/basic.py b/wolnelektury/settings/basic.py
index dea4b42..30812e5 100644 (file)
--- a/wolnelektury/settings/basic.py
+++ b/wolnelektury/settings/basic.py
@@ -1,5 +1,5 @@
 from os import path
 from os import path

-from settings.paths import PROJECT_DIR
+from .paths import PROJECT_DIR

 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG


@@ -30,6 +30,7 @@ SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = 'Europe/Warsaw'
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = 'Europe/Warsaw'

+USE_TZ = True

 
 SITE_ID = 1
 
 
 SITE_ID = 1