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
commitb4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806 (patch)
tree62a492aa95c5747a1e08286a2b10162af20c5ae4 /settings.py
parent5f9330149395ed88f320759aeee294bbde190e31 (diff)
downloadtroggle-b4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806.tar.gz
troggle-b4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806.tar.bz2
troggle-b4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806.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