Accepting merge (branches/carpenter->trunk). Incorporates update svn ignore property...

[osqa.git] / urls.py

diff --git a/urls.py b/urls.py
index 51fa72080700056993c6f007270e51a7de9fe903..0355657c9d3d7d279c19009ea10398fa90c3da94 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -3,7 +3,7 @@ from django.utils.translation import ugettext as _
 from django.conf import settings
 
 urlpatterns = patterns('',
 from django.conf import settings
 
 urlpatterns = patterns('',

-    (r'^%s' % settings.FORUM_SCRIPT_ALIAS, include('forum.urls')),
+    (r'', include('forum.urls')),

 )
 
 if 'rosetta' in settings.INSTALLED_APPS:
 )
 
 if 'rosetta' in settings.INSTALLED_APPS: