summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 06:04:28 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 06:04:28 +0100
commit575fa986aea19d4ce5a04f324560ed8d26025b1a (patch)
treea7471817af5d80303212b93529144ea337e80870 /urls.py
parentb5525373544b874249079f02e116e682ad74f823 (diff)
downloadtroggle-575fa986aea19d4ce5a04f324560ed8d26025b1a.tar.gz
troggle-575fa986aea19d4ce5a04f324560ed8d26025b1a.tar.bz2
troggle-575fa986aea19d4ce5a04f324560ed8d26025b1a.zip
[svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8277 by aaron @ 3/14/2009 4:09 PM
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py4
1 files 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}),
)