summaryrefslogtreecommitdiffstats
path: root/settings.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-15 03:38:11 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-15 03:38:11 +0100
commitf27d5988f0178a5077251fdb43335de3c35222b7 (patch)
tree9c0569043a5dfaf2f40faa14ce4e2daa9cc51139 /settings.py
parentd8a215a575ec6e6b332dc8db26c81a8bfb20264f (diff)
downloadtroggle-f27d5988f0178a5077251fdb43335de3c35222b7.tar.gz
troggle-f27d5988f0178a5077251fdb43335de3c35222b7.tar.bz2
troggle-f27d5988f0178a5077251fdb43335de3c35222b7.zip
[svn] semi ugly hack...
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/settings.py b/settings.py
index e99d199..c69d03f 100644
--- a/settings.py
+++ b/settings.py
@@ -1,4 +1,4 @@
-from localsettings import *
+from localsettings import * #inital localsettings call so that urljoins work
import os
import urlparse
# Django settings for troggle project.
@@ -86,4 +86,6 @@ INSTALLED_APPS = (
'troggle.profiles',
'troggle.expo',
'troggle.imagekit',
-) \ No newline at end of file
+)
+
+from localsettings import * #localsettings needs to take precedence. Call it to override any existing vars. \ No newline at end of file