From 575fa986aea19d4ce5a04f324560ed8d26025b1a Mon Sep 17 00:00:00 2001
From: substantialnoninfringinguser <substantialnoninfringinguser@gmail.com>
Date: Wed, 13 May 2009 06:04:28 +0100
Subject: [PATCH] [svn] Copied from
http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8277 by aaron @
3/14/2009 4:09 PM
---
urls.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/urls.py b/urls.py
index 239adff..c2ea1a2 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,5 @@
from django.conf.urls.defaults import *
-from django.conf import settings
+import troggle.settings as settings
from expo.views import * # flat import
from expo.views_caves import *
@@ -77,5 +77,5 @@ urlpatterns = patterns('',
{'document_root': settings.SURVEYS, 'show_indexes':True}),
(r'^photos/(?P<path>.*)$', 'django.views.static.serve',
- {'document_root': settings.PHOTOS, 'show_indexes':True}),
+ {'document_root': settings.PHOTO_ROOT, 'show_indexes':True}),
)