summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/urls.py b/urls.py
index 339791c9..8c349456 100644
--- a/urls.py
+++ b/urls.py
@@ -1,5 +1,7 @@
-from django.conf.urls.defaults import *
-from django.utils.translation import ugettext as _
+"""
+main url configuration file for the askbot site
+"""
+from django.conf.urls.defaults import patterns, include, url
from django.conf import settings
from django.contrib import admin
@@ -8,6 +10,7 @@ admin.autodiscover()
urlpatterns = patterns('',
(r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
(r'^admin/', include(admin.site.urls)),
+ (r'^settings/', include('livesettings.urls')),
)
if 'rosetta' in settings.INSTALLED_APPS: