[svn] semi ugly hack...

2009-05-15 03:38:11 +01:00
parent d8a215a575
commit f27d5988f0
1 changed files with 4 additions and 2 deletions
--- 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', 
-)
+)
+
+from localsettings import * #localsettings needs to take precedence. Call it to override any existing vars.